fixed mergeconflict