message: Fixed merge conflict.
diff: @@ -2152,8 +2152,8 @@ inline bool IsConv1x1StrideNot1(memory::dims filter_dims,
  }
  #ifdef ENABLE_MKLDNN_V1
  -void execute_primitives(std::vector<mkldnn::primitive>& primitives,
  - std::shared_ptr<stream> stream,
  +void execute_primitives(
  + std::vector<mkldnn::primitive>& primitives, std::shared_ptr<stream> stream,
  std::vector<std::unordered_map<int, memory>>& net_args) {
  DCHECK_EQ(primitives.size(), net_args.size());
  for (size_t i = 0; i < primitives.size(); ++i) {
  