[BUGFIX] Correct handling of file merges/inclusions