make branch even with master