Removed dangling merge conflict markers