added airstrike
fix conflict