Better safe merge than risky rebase