updated copy
fixed conflict