sync and merge w/ upstream