Fix VERSION after merge