Fixing Scott's merge