removed conflicted commit