solve conflicts from rebase