updating file, to look on merging process