We've got merge conflict markers checked in here!