Removed merge conflict markers