Fix Merging