fixed a merge conflict in Store