Remove flex conflicts