Fix merge conflict markers that were apparently erroneously committed in ddc6d55c9af204adb7b7b309b99cb3f4f98277e8