Removed artifacts of merge conflicts