Rebase master git after revert