fixing mergeconflicts