fix conflicts

Author: yinhaofeng

models/rank/wide_deep/config.yaml

@@ -32,8 +32,8 @@ runner:
   infer_end_epoch: 3
   #use inference save model
   use_inference: False
-  save_inference_feed_varnames: ["label","C1","C2","C3","C4","C5","C6","C7","C8","C9","C10","C11","C12","C13","C14","C15","C16","C17","C18","C19","C20","C21","C22","C23","C24","C25","C26","dense_input"]
-  save_inference_fetch_varnames: ["cast_0.tmp_0"]
+  save_inference_feed_varnames: ["C1","C2","C3","C4","C5","C6","C7","C8","C9","C10","C11","C12","C13","C14","C15","C16","C17","C18","C19","C20","C21","C22","C23","C24","C25","C26","dense_input"]
+  save_inference_fetch_varnames: ["sigmoid_0.tmp_0"]
   #use fleet
   use_fleet: False