added NO to ok.txt
fixed conflict