ammend last merge