[albertopv]

In my experience you can't use feature flags for everything. Also, if you are having so much trouble merging because of lot of changes and commits, that's a smell of a bad design or a project too big that must be broken up.