Make progress window start counting earlier
Cleanup
Allow baseless merging
Adjust empty TMX creation
Reimplement combining to be a repeated two-way merge with conflict resolution
Add tests for baseless merging and combining
Document changes