BS-944 correction of conflict