Support --check and also support writing diffs to file
Merging