fix wrong conflicted commit