some changes...
fixed conflict