update .yml
fixed conflict