re-fix merge