Fix bug in resolveconflict
Cherry-picking and selecting nodes. Fixes #46