Updating my master with changes in his master?