Fix version conflicts caused by PR#139#142

sucrose0413 wants to merge 1 commit into

reactivemarbles:mainreactivemarbles/SocialQ:mainfrom

sucrose0413:mainsucrose0413/SocialQ:mainCopy head branch name to clipboard