Options record
Allow dumping of conflict diffs
Update to version 0.2