fixed some shizzle
Fixed merge conflict