after resolving rebase conflicts