switching branches to work on merge issues