Removed merge conflict tags.