trying to fix conflicts
removed a lot
trying to get branches playing nicely