events courses fix
conflict
conflict res