Resolvierndo Merge