Fixing merge
Fixing Merge?