fix the error for submit merge
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -293,7 +293,6 @@ def makePreMergeTaskList(args, preMergeDir, setup):