changes to work with the conflicts analyzer