Fixes #4239 merge injects with new vars loaded from files