Mapping refactor fix

DefunctRoute and Conflict handlers were not being merged. ..