Add rebase section to solve-merge-and-rebase-conflicts