rebase conflicts resolution