iJustNeedResolveMergeConflict