Fix merge conflicts

Author: Quoc Truong

Engine/Helper.cs

@@ -624,11 +624,7 @@ public int Compare(Tuple<int, int> t1, Tuple<int, int> t2)
     /// </summary>
     public class FindPipelineOutput : ICustomAstVisitor
     {
-<<<<<<< HEAD
         List<Tuple<string, StatementAst>> outputTypes;
-=======
-        List<string> outputTypes;
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
 
         IEnumerable<TypeDefinitionAst> classes;
 
@@ -669,11 +665,7 @@ static FindPipelineOutput()
         /// <param name="ast"></param>
         public FindPipelineOutput(FunctionDefinitionAst ast, IEnumerable<TypeDefinitionAst> classes)
         {
-<<<<<<< HEAD
             outputTypes = new List<Tuple<string, StatementAst>>();
-=======
-            outputTypes = new List<string>();
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
             Helper.Instance.InitializeVariableAnalysis(ast);
             this.classes = classes;
             myFunction = ast;
@@ -685,24 +677,12 @@ public FindPipelineOutput(FunctionDefinitionAst ast, IEnumerable<TypeDefinitionA
         }
 
         /// <summary>
-<<<<<<< HEAD
         /// Get list of outputTypes from functiondefinitionast funcast
         /// </summary>
         /// <returns></returns>
         public static List<Tuple<string, StatementAst>> OutputTypes(FunctionDefinitionAst funcAst, IEnumerable<TypeDefinitionAst> classes)
         {
             return (new FindPipelineOutput(funcAst, classes)).outputTypes;
-=======
-        /// Get list of outputTypes
-        /// </summary>
-        /// <returns></returns>
-        public List<string> OutputTypes
-        {
-            get
-            {
-                return outputTypes;
-            }
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
         }
 
         /// <summary>
@@ -827,20 +807,12 @@ public object VisitNamedBlock(NamedBlockAst namedBlockAst)
         {
             if (namedBlockAst != null)
             {
-<<<<<<< HEAD
                 foreach (StatementAst block in namedBlockAst.Statements)
-=======
-                foreach (var block in namedBlockAst.Statements)
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
                 {
                     object type = block.Visit(this);
                     if (type != null && type is string && !String.IsNullOrWhiteSpace(type as string))
                     {
-<<<<<<< HEAD
                         outputTypes.Add(Tuple.Create(type as string, block));
-=======
-                        outputTypes.Add(type as string);
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
                     }
                 }
             }
@@ -857,20 +829,12 @@ public object VisitStatementBlock(StatementBlockAst statementBlockAst)
         {
             if (statementBlockAst != null)
             {
-<<<<<<< HEAD
                 foreach (StatementAst block in statementBlockAst.Statements)
-=======
-                foreach (var block in statementBlockAst.Statements)
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
                 {
                     object type = block.Visit(this);
                     if (type != null && type is string && !String.IsNullOrWhiteSpace(type as string))
                     {
-<<<<<<< HEAD
                         outputTypes.Add(Tuple.Create(type as string, block));
-=======
-                        outputTypes.Add(type as string);
->>>>>>> 01a9d251e1344f53c7a881fccacc5123ce02827a
                     }
                 }
             }