Refactored conflicter, added _ask() regression test