I'm not sure if this is currently available but do you have an option not to merge the feature files?