some changes
fixed conflict