resolved a commit conflict