some changes ...
fixed conflict