amend last merge