removed stuff
fixed conficts