merge upstream and update binary