removed everything
solving things on gh
cannot see conflicts