fix merge conflict

tests/python/unittest/test_gluon_trainer.py

@@ -74,12 +74,13 @@ def dict_equ(a, b):
  if trainer._update_on_kvstore:
  dict_equ(trainer._kvstore._updater.states, states)
  assert trainer._optimizers[0] == trainer._kvstore._updater.optimizer
+ # invalid usage of update and allreduce_grads if update_on_kvstore
+ assert_raises(AssertionError, trainer.update, 1)
+ assert_raises(AssertionError, trainer.allreduce_grads)
  else:
  for updater in trainer._updaters:
  dict_equ(updater.states, states)
  assert trainer._optimizers[0] == trainer._updaters[0].optimizer
- assert_raises(AssertionError, trainer.update, 1)
- assert_raises(AssertionError, trainer.allreduce_grads)
 
  x = gluon.Parameter('x', shape=(10,))
  x.initialize(ctx=[mx.cpu(0), mx.cpu(1)], init='zeros')