Demo version 0.0.12

The full version now detects if the file is modified externally, and generates conflict file, which user can open in default editor and fix conflict.