use proper object store merge

This commit is contained in:
Ari Lazier 2016-12-05 16:23:56 +01:00
parent 335d035752
commit 4f3bf08704

@ -1 +1 @@
Subproject commit 64e0fa208c0ba8147f05d02fe41353b345901804
Subproject commit 580776d3fe300b54ed769672d8c3a1e2914a259e