Fix for bad merge code