lazygit rebase conflict