small fixes
fixed conflict