trying to fix conflicts
removed a lot