Removed merge conflict artifacts