fixing mergeconflict