Merge Text Files: Combine and Resolve Conflicts