Allow to fix own conflicts
Simplify notification of file renames
Allow to use relative & absolute paths and ignore rename of conflicts