Removed remenants of a merge conflict