fixed mergeconflict2