fixed mergeconflicts