Simplestore rename to B2share fix conflicts

Remove committed merge conflicted files added by pull-request: #356.