[BUGFIX] Merge with add file and file reference properties