Fix Merge 1