minor changes
fixed conflict