message: Fix merge conflict error
diff: @@ -39,9 +39,8 @@ TfLiteRegistration Register_DEPTHWISE_CONV_2D();
  TfLiteRegistration Register_ELU();
  TfLiteRegistration Register_EXP();
  TfLiteRegistration Register_EXPAND_DIMS();
  -TfLiteRegistration Register_L2_POOL_2D();
  -TfLiteRegistration Register_LEAKY_RELU();
  TfLiteRegistration Register_FILL();
  +TfLiteRegistration Register_L2_POOL_2D();
  TfLiteRegistration Register_LEAKY_RELU();
  TfLiteRegistration Register_QUANTIZE();
  TfLiteRegistration Register_SHAPE();
  