fix mergeconflict