Fixed another conflicts