Added tests for clobber and abandon conflict resolution
Changed function name of _prefixed() to _origin()
Added functions for clobber and abandon conflict resolution
Added some todo/idea items to notes