made a note that the conflict checker is not complete