best in a separate branch per version
best in a separate branch per version