Nrighton233j
Fix merge conflict resolution: remove literal conflict-marker text
9cb3523