fixed conflict for real