Fix version conflicts caused by PR#231#232

sucrose0413 wants to merge 1 commit into

Poltuu:masterPoltuu/Harpoon:masterfrom

sucrose0413:mastersucrose0413/Harpoon:masterCopy head branch name to clipboard