Removed remaining merge conflict indicators from file