working shizzle
fix conflicts