Fixed conflict (hopefully)