erased the conflict thingens