Rebase branch, resolve conflicts