Fix merge issue
Fix merge issue

FollowMyVote/bitshares,RemitaBit/Remitabit,RemitaBit/Remitabit,denkhaus/bitsharesx,bitshares/bitshares-0.x,bitshares/bitshares-0.x,bitshares/bitshares-0.x,jakeporter/Bitshares,bitshares/devshares,frrp/bitshares,bitshares/bitshares,Ziftr/bitshares,bitshares/bitshares-0.x,bitshares/devshares,bitshares/devshares,bitshares/bitshares,RemitaBit/Remitabit,FollowMyVote/bitshares,bitshares/bitshares,Ziftr/bitshares,frrp/bitshares,bitshares/bitshares,denkhaus/bitsharesx,frrp/bitshares,bitshares/bitshares,denkhaus/bitsharesx,RemitaBit/Remitabit,bitshares/devshares,jakeporter/Bitshares,jakeporter/Bitshares,camponez/bitshares,FollowMyVote/bitshares,jakeporter/Bitshares,Ziftr/bitshares,bitshares/bitshares-0.x,denkhaus/bitsharesx,jakeporter/Bitshares,bitshares/bitshares,bitshares/devshares,camponez/bitshares,FollowMyVote/bitshares,RemitaBit/Remitabit,camponez/bitshares,Ziftr/bitshares,bitshares/bitshares-0.x,FollowMyVote/bitshares,RemitaBit/Remitabit,jakeporter/Bitshares,frrp/bitshares,frrp/bitshares,camponez/bitshares,bitshares/devshares,FollowMyVote/bitshares,camponez/bitshares,frrp/bitshares,camponez/bitshares