Removed merge conflict artifacts.