update readme to reflect last merge