autocomplete in place
resolveconflits1