fix mergeconflic