conflict finally resolved