Merge fails fixed