Mergeconflict Resolved