restored files which were deleting during merging