Avoid recurring merge conflicts by creating release-only branches that won't get merged back into another branch. Increment the version string in this branch.