WIP: merge work

* clean_test target improved to clean up after mess left by conflict test
  case.
* Comments added to conflict.h to make clear what exactly is changing.
* Index for repo properly updated for conflicts now. However, can't get
  libgit2 to provide file on disk with conflict markers.
  * Workaround: use "git checkout -m <filename>"