removed conflict shizzle