merge conflict sorted in intellinav