Remove merge conflict marker to fix build