fix reg branch conflicts