general changes
fixed conflict