more towards mainline/feature branch model