concat of diffs have been refactored
- now merge seems to function