Pulling in commits made while pairing