amending last merge