merged pull reqs + fresh build