more specific changes
fixed conflict