Auto-merging src/merge-file.ts
CONFLICT (add/add): Merge conflict in src/merge-file.ts
Automatic merge failed; fix conflicts and then commit the result.
