merge pull-request manually...