second amend
fixed conflict