Fix of mergeconflicts