dev_1.0 change2
fixed conflict