Fixing typo in merge procedure
More fixes for merging - it's working now
After fixing merge, add a test to verify it stays fixed