History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
Magne Sjaastad