manual fix rebase issues and merge issues