yolo code
fixed conflict