It's been a very long time, so I think a merge will be better than a rebase. There was only one simple conflict.