Fix the conflict for real