Fix ConflictMotions dependencies; add ConflictDetection; fix mapping clashes with vim-unimpaired