ammending last merge