manual merge bluefox