sorting out conflict