Fixed mergeconflict better