cleaned up hazardDetect
testing merge --working