Refactor merging to allow detailed step-by-step analysis
Deal with user canceling merge, add correctness checks
Allow reporting merge changes to OmegaT