From b9e41d5cba93920a2d766050fd4e978670a1ead8 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Thu, 10 Dec 2015 15:42:33 +0100
Subject: [PATCH] Use mergeOptions instead of Object.assign when merging
 sources to check for clashes

---
 js/stores/edition_store.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/stores/edition_store.js b/js/stores/edition_store.js
index 3a35dbad..8fdd681b 100644
--- a/js/stores/edition_store.js
+++ b/js/stores/edition_store.js
@@ -7,6 +7,8 @@ import EditionActions from '../actions/edition_actions';
 import EditionSource from '../sources/edition_source';
 import CoaSource from '../sources/coa_source';
 
+import { mergeOptions } from '../utils/general_utils';
+
 
 class EditionStore {
     constructor() {
@@ -20,7 +22,7 @@ class EditionStore {
         };
 
         this.bindActions(EditionActions);
-        this.registerAsync(Object.assign(EditionSource, CoaSource));
+        this.registerAsync(mergeOptions(EditionSource, CoaSource));
     }
 
     onFetchEdition(idToFetch) {