made change
fixed conflict