diff --git a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSL.tokens b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSL.tokens
index 9f9578349e005c911652b1995868154f2a47df97..f4cc0bd8ca08d4de37c4f6782de74ba30639ed5d 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSL.tokens
+++ b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSL.tokens
@@ -2,7 +2,6 @@
 '<'=20
 '<='=22
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 '='=76
 '=='=18
 '>'=21
@@ -70,8 +69,6 @@
 'with'=28
 'without'=70
 =======
-=======
->>>>>>> Stashed changes
 '='=72
 '=='=18
 '>'=21
@@ -134,9 +131,6 @@
 'variables'=70
 'with'=25
 'without'=66
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
 >>>>>>> Stashed changes
 RULE_ANY_OTHER=15
 RULE_ASSOCIATION=5
@@ -216,12 +210,9 @@ T__78=78
 T__79=79
 T__80=80
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 T__81=81
 T__82=82
 T__83=83
 T__84=84
 =======
 >>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLLexer.java b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLLexer.java
index 7e1200e2583ddb6eac9e83a09e1f4790c36a3117..7ec4692b4fe5b8ad5f3b765195ff507b7e571f6b 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLLexer.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLLexer.java
@@ -2887,10 +2887,7 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "\1\u0120",
             "\1\u0121",
             "\1\u0122",
-<<<<<<< Updated upstream
             "\1\u0123",
-=======
->>>>>>> Stashed changes
             "",
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
             "\1\u0124",
@@ -2934,11 +2931,8 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "\1\u0142",
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
             "\1\u0144",
-<<<<<<< Updated upstream
             "",
             "",
-=======
->>>>>>> Stashed changes
             "\1\u0145",
             "\1\u0146",
             "\1\u0147",
@@ -3074,13 +3068,8 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "\1\u01b2",
             "",
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
-<<<<<<< Updated upstream
             "",
             "",
-=======
-            "",
-            "",
->>>>>>> Stashed changes
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
             "\1\u01b5",
             "\1\u01b6",
@@ -3240,13 +3229,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
 
                         else if ( (LA12_0=='a') ) {s = 21;}
 
-<<<<<<< Updated upstream
-=======
-                        else if ( (LA12_0=='r') ) {s = 20;}
-
-                        else if ( (LA12_0=='a') ) {s = 21;}
-
->>>>>>> Stashed changes
                         else if ( (LA12_0=='l') ) {s = 22;}
 
                         else if ( (LA12_0=='G') ) {s = 23;}
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLParser.java b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLParser.java
index 8a34d2ab3726c359ccdfd7938a286ec730da7acf..ecf44e3603c6b9a5b5d2ef5c3ae1078e3be218b9 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLParser.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSLParser.java
@@ -15689,8 +15689,6 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalContentAssis
     // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group__5"
     // InternalTestgeneratorDSL.g:5024:1: rule__BusinessRuleTaskFlowElement__Group__5 : rule__BusinessRuleTaskFlowElement__Group__5__Impl rule__BusinessRuleTaskFlowElement__Group__6 ;
     public final void rule__BusinessRuleTaskFlowElement__Group__5() throws RecognitionException {
-<<<<<<< Updated upstream
-=======
 
         		int stackSize = keepStackSize();
         	
@@ -16467,1093 +16465,12 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalContentAssis
     // $ANTLR start "rule__GatewayFlowElement__Group__0"
     // InternalTestgeneratorDSL.g:5294:1: rule__GatewayFlowElement__Group__0 : rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1 ;
     public final void rule__GatewayFlowElement__Group__0() throws RecognitionException {
->>>>>>> Stashed changes
 
         		int stackSize = keepStackSize();
         	
         try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5028:1: ( rule__BusinessRuleTaskFlowElement__Group__5__Impl rule__BusinessRuleTaskFlowElement__Group__6 )
-            // InternalTestgeneratorDSL.g:5029:2: rule__BusinessRuleTaskFlowElement__Group__5__Impl rule__BusinessRuleTaskFlowElement__Group__6
-=======
-            // InternalTestgeneratorDSL.g:5298:1: ( rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1 )
-            // InternalTestgeneratorDSL.g:5299:2: rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_32);
-            rule__BusinessRuleTaskFlowElement__Group__5__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group__6();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group__5"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group__5__Impl"
-    // InternalTestgeneratorDSL.g:5036:1: rule__BusinessRuleTaskFlowElement__Group__5__Impl : ( ( rule__BusinessRuleTaskFlowElement__Group_5__0 )? ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group__5__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__0__Impl"
-    // InternalTestgeneratorDSL.g:5306:1: rule__GatewayFlowElement__Group__0__Impl : ( 'FlowElement' ) ;
-    public final void rule__GatewayFlowElement__Group__0__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5040:1: ( ( ( rule__BusinessRuleTaskFlowElement__Group_5__0 )? ) )
-            // InternalTestgeneratorDSL.g:5041:1: ( ( rule__BusinessRuleTaskFlowElement__Group_5__0 )? )
-            {
-            // InternalTestgeneratorDSL.g:5041:1: ( ( rule__BusinessRuleTaskFlowElement__Group_5__0 )? )
-            // InternalTestgeneratorDSL.g:5042:2: ( rule__BusinessRuleTaskFlowElement__Group_5__0 )?
-=======
-            // InternalTestgeneratorDSL.g:5310:1: ( ( 'FlowElement' ) )
-            // InternalTestgeneratorDSL.g:5311:1: ( 'FlowElement' )
-            {
-            // InternalTestgeneratorDSL.g:5311:1: ( 'FlowElement' )
-            // InternalTestgeneratorDSL.g:5312:2: 'FlowElement'
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getGroup_5()); 
-            // InternalTestgeneratorDSL.g:5043:2: ( rule__BusinessRuleTaskFlowElement__Group_5__0 )?
-            int alt32=2;
-            int LA32_0 = input.LA(1);
-
-            if ( (LA32_0==45) ) {
-                alt32=1;
-            }
-            switch (alt32) {
-                case 1 :
-                    // InternalTestgeneratorDSL.g:5043:3: rule__BusinessRuleTaskFlowElement__Group_5__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__BusinessRuleTaskFlowElement__Group_5__0();
-
-                    state._fsp--;
-
-
-                    }
-                    break;
-
-            }
-
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getGroup_5()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group__5__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group__6"
-    // InternalTestgeneratorDSL.g:5051:1: rule__BusinessRuleTaskFlowElement__Group__6 : rule__BusinessRuleTaskFlowElement__Group__6__Impl ;
-    public final void rule__BusinessRuleTaskFlowElement__Group__6() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__1"
-    // InternalTestgeneratorDSL.g:5321:1: rule__GatewayFlowElement__Group__1 : rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2 ;
-    public final void rule__GatewayFlowElement__Group__1() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5055:1: ( rule__BusinessRuleTaskFlowElement__Group__6__Impl )
-            // InternalTestgeneratorDSL.g:5056:2: rule__BusinessRuleTaskFlowElement__Group__6__Impl
-=======
-            // InternalTestgeneratorDSL.g:5325:1: ( rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2 )
-            // InternalTestgeneratorDSL.g:5326:2: rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group__6__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group__6"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group__6__Impl"
-    // InternalTestgeneratorDSL.g:5062:1: rule__BusinessRuleTaskFlowElement__Group__6__Impl : ( RULE_DECLARATION_FINISHED ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group__6__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__1__Impl"
-    // InternalTestgeneratorDSL.g:5333:1: rule__GatewayFlowElement__Group__1__Impl : ( ( rule__GatewayFlowElement__NameAssignment_1 ) ) ;
-    public final void rule__GatewayFlowElement__Group__1__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5066:1: ( ( RULE_DECLARATION_FINISHED ) )
-            // InternalTestgeneratorDSL.g:5067:1: ( RULE_DECLARATION_FINISHED )
-            {
-            // InternalTestgeneratorDSL.g:5067:1: ( RULE_DECLARATION_FINISHED )
-            // InternalTestgeneratorDSL.g:5068:2: RULE_DECLARATION_FINISHED
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getDECLARATION_FINISHEDTerminalRuleCall_6()); 
-            match(input,RULE_DECLARATION_FINISHED,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getDECLARATION_FINISHEDTerminalRuleCall_6()); 
-=======
-            // InternalTestgeneratorDSL.g:5337:1: ( ( ( rule__GatewayFlowElement__NameAssignment_1 ) ) )
-            // InternalTestgeneratorDSL.g:5338:1: ( ( rule__GatewayFlowElement__NameAssignment_1 ) )
-            {
-            // InternalTestgeneratorDSL.g:5338:1: ( ( rule__GatewayFlowElement__NameAssignment_1 ) )
-            // InternalTestgeneratorDSL.g:5339:2: ( rule__GatewayFlowElement__NameAssignment_1 )
-            {
-             before(grammarAccess.getGatewayFlowElementAccess().getNameAssignment_1()); 
-            // InternalTestgeneratorDSL.g:5340:2: ( rule__GatewayFlowElement__NameAssignment_1 )
-            // InternalTestgeneratorDSL.g:5340:3: rule__GatewayFlowElement__NameAssignment_1
-            {
-            pushFollow(FOLLOW_2);
-            rule__GatewayFlowElement__NameAssignment_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getGatewayFlowElementAccess().getNameAssignment_1()); 
->>>>>>> Stashed changes
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group__6__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__0"
-    // InternalTestgeneratorDSL.g:5078:1: rule__BusinessRuleTaskFlowElement__Group_4__0 : rule__BusinessRuleTaskFlowElement__Group_4__0__Impl rule__BusinessRuleTaskFlowElement__Group_4__1 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__0() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__2"
-    // InternalTestgeneratorDSL.g:5348:1: rule__GatewayFlowElement__Group__2 : rule__GatewayFlowElement__Group__2__Impl rule__GatewayFlowElement__Group__3 ;
-    public final void rule__GatewayFlowElement__Group__2() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5082:1: ( rule__BusinessRuleTaskFlowElement__Group_4__0__Impl rule__BusinessRuleTaskFlowElement__Group_4__1 )
-            // InternalTestgeneratorDSL.g:5083:2: rule__BusinessRuleTaskFlowElement__Group_4__0__Impl rule__BusinessRuleTaskFlowElement__Group_4__1
-            {
-            pushFollow(FOLLOW_33);
-            rule__BusinessRuleTaskFlowElement__Group_4__0__Impl();
-=======
-            // InternalTestgeneratorDSL.g:5352:1: ( rule__GatewayFlowElement__Group__2__Impl rule__GatewayFlowElement__Group__3 )
-            // InternalTestgeneratorDSL.g:5353:2: rule__GatewayFlowElement__Group__2__Impl rule__GatewayFlowElement__Group__3
-            {
-            pushFollow(FOLLOW_35);
-            rule__GatewayFlowElement__Group__2__Impl();
->>>>>>> Stashed changes
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_4__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__0"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__0__Impl"
-    // InternalTestgeneratorDSL.g:5090:1: rule__BusinessRuleTaskFlowElement__Group_4__0__Impl : ( 'with' ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__0__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__2__Impl"
-    // InternalTestgeneratorDSL.g:5360:1: rule__GatewayFlowElement__Group__2__Impl : ( RULE_ASSOCIATION ) ;
-    public final void rule__GatewayFlowElement__Group__2__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5094:1: ( ( 'with' ) )
-            // InternalTestgeneratorDSL.g:5095:1: ( 'with' )
-            {
-            // InternalTestgeneratorDSL.g:5095:1: ( 'with' )
-            // InternalTestgeneratorDSL.g:5096:2: 'with'
-=======
-            // InternalTestgeneratorDSL.g:5364:1: ( ( RULE_ASSOCIATION ) )
-            // InternalTestgeneratorDSL.g:5365:1: ( RULE_ASSOCIATION )
-            {
-            // InternalTestgeneratorDSL.g:5365:1: ( RULE_ASSOCIATION )
-            // InternalTestgeneratorDSL.g:5366:2: RULE_ASSOCIATION
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getWithKeyword_4_0()); 
-            match(input,25,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getWithKeyword_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__0__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__1"
-    // InternalTestgeneratorDSL.g:5105:1: rule__BusinessRuleTaskFlowElement__Group_4__1 : rule__BusinessRuleTaskFlowElement__Group_4__1__Impl rule__BusinessRuleTaskFlowElement__Group_4__2 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__1() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__3"
-    // InternalTestgeneratorDSL.g:5375:1: rule__GatewayFlowElement__Group__3 : rule__GatewayFlowElement__Group__3__Impl rule__GatewayFlowElement__Group__4 ;
-    public final void rule__GatewayFlowElement__Group__3() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5109:1: ( rule__BusinessRuleTaskFlowElement__Group_4__1__Impl rule__BusinessRuleTaskFlowElement__Group_4__2 )
-            // InternalTestgeneratorDSL.g:5110:2: rule__BusinessRuleTaskFlowElement__Group_4__1__Impl rule__BusinessRuleTaskFlowElement__Group_4__2
-=======
-            // InternalTestgeneratorDSL.g:5379:1: ( rule__GatewayFlowElement__Group__3__Impl rule__GatewayFlowElement__Group__4 )
-            // InternalTestgeneratorDSL.g:5380:2: rule__GatewayFlowElement__Group__3__Impl rule__GatewayFlowElement__Group__4
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_12);
-            rule__BusinessRuleTaskFlowElement__Group_4__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_4__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__1"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__1__Impl"
-    // InternalTestgeneratorDSL.g:5117:1: rule__BusinessRuleTaskFlowElement__Group_4__1__Impl : ( 'resultVariable' ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__1__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__3__Impl"
-    // InternalTestgeneratorDSL.g:5387:1: rule__GatewayFlowElement__Group__3__Impl : ( 'Gateway' ) ;
-    public final void rule__GatewayFlowElement__Group__3__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5121:1: ( ( 'resultVariable' ) )
-            // InternalTestgeneratorDSL.g:5122:1: ( 'resultVariable' )
-            {
-            // InternalTestgeneratorDSL.g:5122:1: ( 'resultVariable' )
-            // InternalTestgeneratorDSL.g:5123:2: 'resultVariable'
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getResultVariableKeyword_4_1()); 
-            match(input,44,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getResultVariableKeyword_4_1()); 
-=======
-            // InternalTestgeneratorDSL.g:5391:1: ( ( 'Gateway' ) )
-            // InternalTestgeneratorDSL.g:5392:1: ( 'Gateway' )
-            {
-            // InternalTestgeneratorDSL.g:5392:1: ( 'Gateway' )
-            // InternalTestgeneratorDSL.g:5393:2: 'Gateway'
-            {
-             before(grammarAccess.getGatewayFlowElementAccess().getGatewayKeyword_3()); 
-            match(input,47,FOLLOW_2); 
-             after(grammarAccess.getGatewayFlowElementAccess().getGatewayKeyword_3()); 
->>>>>>> Stashed changes
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__1__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__2"
-    // InternalTestgeneratorDSL.g:5132:1: rule__BusinessRuleTaskFlowElement__Group_4__2 : rule__BusinessRuleTaskFlowElement__Group_4__2__Impl rule__BusinessRuleTaskFlowElement__Group_4__3 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__2() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__4"
-    // InternalTestgeneratorDSL.g:5402:1: rule__GatewayFlowElement__Group__4 : rule__GatewayFlowElement__Group__4__Impl ;
-    public final void rule__GatewayFlowElement__Group__4() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5136:1: ( rule__BusinessRuleTaskFlowElement__Group_4__2__Impl rule__BusinessRuleTaskFlowElement__Group_4__3 )
-            // InternalTestgeneratorDSL.g:5137:2: rule__BusinessRuleTaskFlowElement__Group_4__2__Impl rule__BusinessRuleTaskFlowElement__Group_4__3
-=======
-            // InternalTestgeneratorDSL.g:5406:1: ( rule__GatewayFlowElement__Group__4__Impl )
-            // InternalTestgeneratorDSL.g:5407:2: rule__GatewayFlowElement__Group__4__Impl
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_7);
-            rule__BusinessRuleTaskFlowElement__Group_4__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_4__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__2"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__2__Impl"
-    // InternalTestgeneratorDSL.g:5144:1: rule__BusinessRuleTaskFlowElement__Group_4__2__Impl : ( RULE_ASSOCIATION ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__2__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__GatewayFlowElement__Group__4__Impl"
-    // InternalTestgeneratorDSL.g:5413:1: rule__GatewayFlowElement__Group__4__Impl : ( RULE_DECLARATION_FINISHED ) ;
-    public final void rule__GatewayFlowElement__Group__4__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5148:1: ( ( RULE_ASSOCIATION ) )
-            // InternalTestgeneratorDSL.g:5149:1: ( RULE_ASSOCIATION )
-            {
-            // InternalTestgeneratorDSL.g:5149:1: ( RULE_ASSOCIATION )
-            // InternalTestgeneratorDSL.g:5150:2: RULE_ASSOCIATION
-=======
-            // InternalTestgeneratorDSL.g:5417:1: ( ( RULE_DECLARATION_FINISHED ) )
-            // InternalTestgeneratorDSL.g:5418:1: ( RULE_DECLARATION_FINISHED )
-            {
-            // InternalTestgeneratorDSL.g:5418:1: ( RULE_DECLARATION_FINISHED )
-            // InternalTestgeneratorDSL.g:5419:2: RULE_DECLARATION_FINISHED
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getASSOCIATIONTerminalRuleCall_4_2()); 
-            match(input,RULE_ASSOCIATION,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getASSOCIATIONTerminalRuleCall_4_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__2__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__3"
-    // InternalTestgeneratorDSL.g:5159:1: rule__BusinessRuleTaskFlowElement__Group_4__3 : rule__BusinessRuleTaskFlowElement__Group_4__3__Impl ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__3() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__0"
-    // InternalTestgeneratorDSL.g:5429:1: rule__SequenceFlowElement__Group__0 : rule__SequenceFlowElement__Group__0__Impl rule__SequenceFlowElement__Group__1 ;
-    public final void rule__SequenceFlowElement__Group__0() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5163:1: ( rule__BusinessRuleTaskFlowElement__Group_4__3__Impl )
-            // InternalTestgeneratorDSL.g:5164:2: rule__BusinessRuleTaskFlowElement__Group_4__3__Impl
-=======
-            // InternalTestgeneratorDSL.g:5433:1: ( rule__SequenceFlowElement__Group__0__Impl rule__SequenceFlowElement__Group__1 )
-            // InternalTestgeneratorDSL.g:5434:2: rule__SequenceFlowElement__Group__0__Impl rule__SequenceFlowElement__Group__1
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_4__3__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__3"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_4__3__Impl"
-    // InternalTestgeneratorDSL.g:5170:1: rule__BusinessRuleTaskFlowElement__Group_4__3__Impl : ( ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 ) ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_4__3__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__0__Impl"
-    // InternalTestgeneratorDSL.g:5441:1: rule__SequenceFlowElement__Group__0__Impl : ( 'FlowElement' ) ;
-    public final void rule__SequenceFlowElement__Group__0__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5174:1: ( ( ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 ) ) )
-            // InternalTestgeneratorDSL.g:5175:1: ( ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 ) )
-            {
-            // InternalTestgeneratorDSL.g:5175:1: ( ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 ) )
-            // InternalTestgeneratorDSL.g:5176:2: ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 )
-=======
-            // InternalTestgeneratorDSL.g:5445:1: ( ( 'FlowElement' ) )
-            // InternalTestgeneratorDSL.g:5446:1: ( 'FlowElement' )
-            {
-            // InternalTestgeneratorDSL.g:5446:1: ( 'FlowElement' )
-            // InternalTestgeneratorDSL.g:5447:2: 'FlowElement'
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getResultVariableAssignment_4_3()); 
-            // InternalTestgeneratorDSL.g:5177:2: ( rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3 )
-            // InternalTestgeneratorDSL.g:5177:3: rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3
-            {
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__ResultVariableAssignment_4_3();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getResultVariableAssignment_4_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_4__3__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__0"
-    // InternalTestgeneratorDSL.g:5186:1: rule__BusinessRuleTaskFlowElement__Group_5__0 : rule__BusinessRuleTaskFlowElement__Group_5__0__Impl rule__BusinessRuleTaskFlowElement__Group_5__1 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__0() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__1"
-    // InternalTestgeneratorDSL.g:5456:1: rule__SequenceFlowElement__Group__1 : rule__SequenceFlowElement__Group__1__Impl rule__SequenceFlowElement__Group__2 ;
-    public final void rule__SequenceFlowElement__Group__1() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5190:1: ( rule__BusinessRuleTaskFlowElement__Group_5__0__Impl rule__BusinessRuleTaskFlowElement__Group_5__1 )
-            // InternalTestgeneratorDSL.g:5191:2: rule__BusinessRuleTaskFlowElement__Group_5__0__Impl rule__BusinessRuleTaskFlowElement__Group_5__1
-=======
-            // InternalTestgeneratorDSL.g:5460:1: ( rule__SequenceFlowElement__Group__1__Impl rule__SequenceFlowElement__Group__2 )
-            // InternalTestgeneratorDSL.g:5461:2: rule__SequenceFlowElement__Group__1__Impl rule__SequenceFlowElement__Group__2
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_34);
-            rule__BusinessRuleTaskFlowElement__Group_5__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_5__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__0"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__0__Impl"
-    // InternalTestgeneratorDSL.g:5198:1: rule__BusinessRuleTaskFlowElement__Group_5__0__Impl : ( 'and' ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__0__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__1__Impl"
-    // InternalTestgeneratorDSL.g:5468:1: rule__SequenceFlowElement__Group__1__Impl : ( ( rule__SequenceFlowElement__NameAssignment_1 ) ) ;
-    public final void rule__SequenceFlowElement__Group__1__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5202:1: ( ( 'and' ) )
-            // InternalTestgeneratorDSL.g:5203:1: ( 'and' )
-            {
-            // InternalTestgeneratorDSL.g:5203:1: ( 'and' )
-            // InternalTestgeneratorDSL.g:5204:2: 'and'
-=======
-            // InternalTestgeneratorDSL.g:5472:1: ( ( ( rule__SequenceFlowElement__NameAssignment_1 ) ) )
-            // InternalTestgeneratorDSL.g:5473:1: ( ( rule__SequenceFlowElement__NameAssignment_1 ) )
-            {
-            // InternalTestgeneratorDSL.g:5473:1: ( ( rule__SequenceFlowElement__NameAssignment_1 ) )
-            // InternalTestgeneratorDSL.g:5474:2: ( rule__SequenceFlowElement__NameAssignment_1 )
-            {
-             before(grammarAccess.getSequenceFlowElementAccess().getNameAssignment_1()); 
-            // InternalTestgeneratorDSL.g:5475:2: ( rule__SequenceFlowElement__NameAssignment_1 )
-            // InternalTestgeneratorDSL.g:5475:3: rule__SequenceFlowElement__NameAssignment_1
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getAndKeyword_5_0()); 
-            match(input,45,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getAndKeyword_5_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__0__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__1"
-    // InternalTestgeneratorDSL.g:5213:1: rule__BusinessRuleTaskFlowElement__Group_5__1 : rule__BusinessRuleTaskFlowElement__Group_5__1__Impl rule__BusinessRuleTaskFlowElement__Group_5__2 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__1() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__2"
-    // InternalTestgeneratorDSL.g:5483:1: rule__SequenceFlowElement__Group__2 : rule__SequenceFlowElement__Group__2__Impl rule__SequenceFlowElement__Group__3 ;
-    public final void rule__SequenceFlowElement__Group__2() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5217:1: ( rule__BusinessRuleTaskFlowElement__Group_5__1__Impl rule__BusinessRuleTaskFlowElement__Group_5__2 )
-            // InternalTestgeneratorDSL.g:5218:2: rule__BusinessRuleTaskFlowElement__Group_5__1__Impl rule__BusinessRuleTaskFlowElement__Group_5__2
-            {
-            pushFollow(FOLLOW_12);
-            rule__BusinessRuleTaskFlowElement__Group_5__1__Impl();
-=======
-            // InternalTestgeneratorDSL.g:5487:1: ( rule__SequenceFlowElement__Group__2__Impl rule__SequenceFlowElement__Group__3 )
-            // InternalTestgeneratorDSL.g:5488:2: rule__SequenceFlowElement__Group__2__Impl rule__SequenceFlowElement__Group__3
-            {
-            pushFollow(FOLLOW_36);
-            rule__SequenceFlowElement__Group__2__Impl();
->>>>>>> Stashed changes
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_5__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__1"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__1__Impl"
-    // InternalTestgeneratorDSL.g:5225:1: rule__BusinessRuleTaskFlowElement__Group_5__1__Impl : ( 'label' ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__1__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__2__Impl"
-    // InternalTestgeneratorDSL.g:5495:1: rule__SequenceFlowElement__Group__2__Impl : ( RULE_ASSOCIATION ) ;
-    public final void rule__SequenceFlowElement__Group__2__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5229:1: ( ( 'label' ) )
-            // InternalTestgeneratorDSL.g:5230:1: ( 'label' )
-            {
-            // InternalTestgeneratorDSL.g:5230:1: ( 'label' )
-            // InternalTestgeneratorDSL.g:5231:2: 'label'
-=======
-            // InternalTestgeneratorDSL.g:5499:1: ( ( RULE_ASSOCIATION ) )
-            // InternalTestgeneratorDSL.g:5500:1: ( RULE_ASSOCIATION )
-            {
-            // InternalTestgeneratorDSL.g:5500:1: ( RULE_ASSOCIATION )
-            // InternalTestgeneratorDSL.g:5501:2: RULE_ASSOCIATION
->>>>>>> Stashed changes
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelKeyword_5_1()); 
-            match(input,46,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelKeyword_5_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__1__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__2"
-    // InternalTestgeneratorDSL.g:5240:1: rule__BusinessRuleTaskFlowElement__Group_5__2 : rule__BusinessRuleTaskFlowElement__Group_5__2__Impl rule__BusinessRuleTaskFlowElement__Group_5__3 ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__2() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__3"
-    // InternalTestgeneratorDSL.g:5510:1: rule__SequenceFlowElement__Group__3 : rule__SequenceFlowElement__Group__3__Impl rule__SequenceFlowElement__Group__4 ;
-    public final void rule__SequenceFlowElement__Group__3() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5244:1: ( rule__BusinessRuleTaskFlowElement__Group_5__2__Impl rule__BusinessRuleTaskFlowElement__Group_5__3 )
-            // InternalTestgeneratorDSL.g:5245:2: rule__BusinessRuleTaskFlowElement__Group_5__2__Impl rule__BusinessRuleTaskFlowElement__Group_5__3
-=======
-            // InternalTestgeneratorDSL.g:5514:1: ( rule__SequenceFlowElement__Group__3__Impl rule__SequenceFlowElement__Group__4 )
-            // InternalTestgeneratorDSL.g:5515:2: rule__SequenceFlowElement__Group__3__Impl rule__SequenceFlowElement__Group__4
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_7);
-            rule__BusinessRuleTaskFlowElement__Group_5__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_5__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__2"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__2__Impl"
-    // InternalTestgeneratorDSL.g:5252:1: rule__BusinessRuleTaskFlowElement__Group_5__2__Impl : ( RULE_ASSOCIATION ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__2__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__3__Impl"
-    // InternalTestgeneratorDSL.g:5522:1: rule__SequenceFlowElement__Group__3__Impl : ( 'SequenceFlow' ) ;
-    public final void rule__SequenceFlowElement__Group__3__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5256:1: ( ( RULE_ASSOCIATION ) )
-            // InternalTestgeneratorDSL.g:5257:1: ( RULE_ASSOCIATION )
-            {
-            // InternalTestgeneratorDSL.g:5257:1: ( RULE_ASSOCIATION )
-            // InternalTestgeneratorDSL.g:5258:2: RULE_ASSOCIATION
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getASSOCIATIONTerminalRuleCall_5_2()); 
-            match(input,RULE_ASSOCIATION,FOLLOW_2); 
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getASSOCIATIONTerminalRuleCall_5_2()); 
-=======
-            // InternalTestgeneratorDSL.g:5526:1: ( ( 'SequenceFlow' ) )
-            // InternalTestgeneratorDSL.g:5527:1: ( 'SequenceFlow' )
-            {
-            // InternalTestgeneratorDSL.g:5527:1: ( 'SequenceFlow' )
-            // InternalTestgeneratorDSL.g:5528:2: 'SequenceFlow'
-            {
-             before(grammarAccess.getSequenceFlowElementAccess().getSequenceFlowKeyword_3()); 
-            match(input,48,FOLLOW_2); 
-             after(grammarAccess.getSequenceFlowElementAccess().getSequenceFlowKeyword_3()); 
->>>>>>> Stashed changes
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__2__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__3"
-    // InternalTestgeneratorDSL.g:5267:1: rule__BusinessRuleTaskFlowElement__Group_5__3 : rule__BusinessRuleTaskFlowElement__Group_5__3__Impl ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__3() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__4"
-    // InternalTestgeneratorDSL.g:5537:1: rule__SequenceFlowElement__Group__4 : rule__SequenceFlowElement__Group__4__Impl rule__SequenceFlowElement__Group__5 ;
-    public final void rule__SequenceFlowElement__Group__4() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5271:1: ( rule__BusinessRuleTaskFlowElement__Group_5__3__Impl )
-            // InternalTestgeneratorDSL.g:5272:2: rule__BusinessRuleTaskFlowElement__Group_5__3__Impl
-=======
-            // InternalTestgeneratorDSL.g:5541:1: ( rule__SequenceFlowElement__Group__4__Impl rule__SequenceFlowElement__Group__5 )
-            // InternalTestgeneratorDSL.g:5542:2: rule__SequenceFlowElement__Group__4__Impl rule__SequenceFlowElement__Group__5
->>>>>>> Stashed changes
-            {
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__Group_5__3__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__3"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__BusinessRuleTaskFlowElement__Group_5__3__Impl"
-    // InternalTestgeneratorDSL.g:5278:1: rule__BusinessRuleTaskFlowElement__Group_5__3__Impl : ( ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 ) ) ;
-    public final void rule__BusinessRuleTaskFlowElement__Group_5__3__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__4__Impl"
-    // InternalTestgeneratorDSL.g:5549:1: rule__SequenceFlowElement__Group__4__Impl : ( ( rule__SequenceFlowElement__Group_4__0 )? ) ;
-    public final void rule__SequenceFlowElement__Group__4__Impl() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
-            // InternalTestgeneratorDSL.g:5282:1: ( ( ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 ) ) )
-            // InternalTestgeneratorDSL.g:5283:1: ( ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 ) )
-            {
-            // InternalTestgeneratorDSL.g:5283:1: ( ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 ) )
-            // InternalTestgeneratorDSL.g:5284:2: ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 )
-            {
-             before(grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelAssignment_5_3()); 
-            // InternalTestgeneratorDSL.g:5285:2: ( rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3 )
-            // InternalTestgeneratorDSL.g:5285:3: rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3
-            {
-            pushFollow(FOLLOW_2);
-            rule__BusinessRuleTaskFlowElement__LabelAssignment_5_3();
-=======
-            // InternalTestgeneratorDSL.g:5553:1: ( ( ( rule__SequenceFlowElement__Group_4__0 )? ) )
-            // InternalTestgeneratorDSL.g:5554:1: ( ( rule__SequenceFlowElement__Group_4__0 )? )
-            {
-            // InternalTestgeneratorDSL.g:5554:1: ( ( rule__SequenceFlowElement__Group_4__0 )? )
-            // InternalTestgeneratorDSL.g:5555:2: ( rule__SequenceFlowElement__Group_4__0 )?
-            {
-             before(grammarAccess.getSequenceFlowElementAccess().getGroup_4()); 
-            // InternalTestgeneratorDSL.g:5556:2: ( rule__SequenceFlowElement__Group_4__0 )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
-
-            if ( (LA33_0==25) ) {
-                alt33=1;
-            }
-            switch (alt33) {
-                case 1 :
-                    // InternalTestgeneratorDSL.g:5556:3: rule__SequenceFlowElement__Group_4__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__SequenceFlowElement__Group_4__0();
-
-                    state._fsp--;
->>>>>>> Stashed changes
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelAssignment_5_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__BusinessRuleTaskFlowElement__Group_5__3__Impl"
-
-
-<<<<<<< Updated upstream
-    // $ANTLR start "rule__GatewayFlowElement__Group__0"
-    // InternalTestgeneratorDSL.g:5294:1: rule__GatewayFlowElement__Group__0 : rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1 ;
-    public final void rule__GatewayFlowElement__Group__0() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__5"
-    // InternalTestgeneratorDSL.g:5564:1: rule__SequenceFlowElement__Group__5 : rule__SequenceFlowElement__Group__5__Impl ;
-    public final void rule__SequenceFlowElement__Group__5() throws RecognitionException {
->>>>>>> Stashed changes
-
-        		int stackSize = keepStackSize();
-        	
-        try {
-<<<<<<< Updated upstream
             // InternalTestgeneratorDSL.g:5298:1: ( rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1 )
             // InternalTestgeneratorDSL.g:5299:2: rule__GatewayFlowElement__Group__0__Impl rule__GatewayFlowElement__Group__1
-=======
-            // InternalTestgeneratorDSL.g:5568:1: ( rule__SequenceFlowElement__Group__5__Impl )
-            // InternalTestgeneratorDSL.g:5569:2: rule__SequenceFlowElement__Group__5__Impl
->>>>>>> Stashed changes
             {
             pushFollow(FOLLOW_4);
             rule__GatewayFlowElement__Group__0__Impl();
@@ -17583,32 +16500,18 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalContentAssis
     // $ANTLR end "rule__GatewayFlowElement__Group__0"
 
 
-<<<<<<< Updated upstream
     // $ANTLR start "rule__GatewayFlowElement__Group__0__Impl"
     // InternalTestgeneratorDSL.g:5306:1: rule__GatewayFlowElement__Group__0__Impl : ( 'FlowElement' ) ;
     public final void rule__GatewayFlowElement__Group__0__Impl() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group__5__Impl"
-    // InternalTestgeneratorDSL.g:5575:1: rule__SequenceFlowElement__Group__5__Impl : ( RULE_DECLARATION_FINISHED ) ;
-    public final void rule__SequenceFlowElement__Group__5__Impl() throws RecognitionException {
->>>>>>> Stashed changes
 
         		int stackSize = keepStackSize();
         	
         try {
-<<<<<<< Updated upstream
             // InternalTestgeneratorDSL.g:5310:1: ( ( 'FlowElement' ) )
             // InternalTestgeneratorDSL.g:5311:1: ( 'FlowElement' )
             {
             // InternalTestgeneratorDSL.g:5311:1: ( 'FlowElement' )
             // InternalTestgeneratorDSL.g:5312:2: 'FlowElement'
-=======
-            // InternalTestgeneratorDSL.g:5579:1: ( ( RULE_DECLARATION_FINISHED ) )
-            // InternalTestgeneratorDSL.g:5580:1: ( RULE_DECLARATION_FINISHED )
-            {
-            // InternalTestgeneratorDSL.g:5580:1: ( RULE_DECLARATION_FINISHED )
-            // InternalTestgeneratorDSL.g:5581:2: RULE_DECLARATION_FINISHED
->>>>>>> Stashed changes
             {
              before(grammarAccess.getGatewayFlowElementAccess().getFlowElementKeyword_0()); 
             match(input,34,FOLLOW_2); 
@@ -17634,32 +16537,18 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalContentAssis
     // $ANTLR end "rule__GatewayFlowElement__Group__0__Impl"
 
 
-<<<<<<< Updated upstream
     // $ANTLR start "rule__GatewayFlowElement__Group__1"
     // InternalTestgeneratorDSL.g:5321:1: rule__GatewayFlowElement__Group__1 : rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2 ;
     public final void rule__GatewayFlowElement__Group__1() throws RecognitionException {
-=======
-    // $ANTLR start "rule__SequenceFlowElement__Group_4__0"
-    // InternalTestgeneratorDSL.g:5591:1: rule__SequenceFlowElement__Group_4__0 : rule__SequenceFlowElement__Group_4__0__Impl rule__SequenceFlowElement__Group_4__1 ;
-    public final void rule__SequenceFlowElement__Group_4__0() throws RecognitionException {
->>>>>>> Stashed changes
 
         		int stackSize = keepStackSize();
         	
         try {
-<<<<<<< Updated upstream
             // InternalTestgeneratorDSL.g:5325:1: ( rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2 )
             // InternalTestgeneratorDSL.g:5326:2: rule__GatewayFlowElement__Group__1__Impl rule__GatewayFlowElement__Group__2
             {
             pushFollow(FOLLOW_12);
             rule__GatewayFlowElement__Group__1__Impl();
-=======
-            // InternalTestgeneratorDSL.g:5595:1: ( rule__SequenceFlowElement__Group_4__0__Impl rule__SequenceFlowElement__Group_4__1 )
-            // InternalTestgeneratorDSL.g:5596:2: rule__SequenceFlowElement__Group_4__0__Impl rule__SequenceFlowElement__Group_4__1
-            {
-            pushFollow(FOLLOW_37);
-            rule__SequenceFlowElement__Group_4__0__Impl();
->>>>>>> Stashed changes
 
             state._fsp--;
 
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSL.tokens b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSL.tokens
index 7805e0b803256c212b88a172b2066c14e2fea69a..efcd56b7a92b8f29fcc1dcfd212c6273c128b33e 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSL.tokens
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSL.tokens
@@ -1,5 +1,4 @@
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 '!='=67
 '<'=78
 '<='=80
@@ -35,24 +34,6 @@
 'Flow'=55
 'FlowElement'=23
 >>>>>>> Stashed changes
-=======
-'!='=66
-'<'=77
-'<='=79
-'='=64
-'=='=65
-'>'=78
-'>='=80
-'BPMNDiagram'=16
-'Boolean'=46
-'BusinessRuleTask'=35
-'DelegateMock'=69
-'EndEvent'=26
-'ExternalServiceMock'=67
-'ExternalTopic'=42
-'Flow'=55
-'FlowElement'=23
->>>>>>> Stashed changes
 'Gateway'=39
 'Integer'=45
 'Loop'=47
@@ -64,7 +45,6 @@
 'StartEvent'=24
 'String'=43
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 'Test'=60
 'UserTask'=27
 'YELLOW'=83
@@ -77,8 +57,6 @@
 'dmn'=21
 'elements'=58
 =======
-=======
->>>>>>> Stashed changes
 'Test'=59
 'UserTask'=27
 'and'=37
@@ -89,43 +67,31 @@
 'delegate'=31
 'dmn'=21
 'elements'=57
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
 >>>>>>> Stashed changes
 'embedded'=22
 'ends'=51
 'expression'=41
 'external'=32
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 'false'=77
 'flag'=57
 =======
 'false'=76
 >>>>>>> Stashed changes
-=======
-'false'=76
->>>>>>> Stashed changes
 'follows'=49
 'for'=56
 'hardcoded'=33
 'has'=52
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 'if'=72
 =======
 'if'=71
 >>>>>>> Stashed changes
-=======
-'if'=71
->>>>>>> Stashed changes
 'inputVariables'=25
 'inputs'=34
 'key'=20
 'label'=38
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 'manual'=74
 'mocks'=62
 'passed'=54
@@ -143,8 +109,6 @@
 'with'=17
 'without'=59
 =======
-=======
->>>>>>> Stashed changes
 'manual'=73
 'mocks'=61
 'passed'=54
@@ -161,9 +125,6 @@
 'variables'=62
 'with'=17
 'without'=58
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
 >>>>>>> Stashed changes
 RULE_ANY_OTHER=15
 RULE_ASSOCIATION=6
@@ -243,12 +204,9 @@ T__78=78
 T__79=79
 T__80=80
 <<<<<<< Updated upstream
-<<<<<<< Updated upstream
 T__81=81
 T__82=82
 T__83=83
 T__84=84
 =======
 >>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLLexer.java b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLLexer.java
index 4c8e3654afb7a37f34d2e54b1b7c964b31e075c8..29a878855cb3f50a8129683720ddcf059d868ed3 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLLexer.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLLexer.java
@@ -1453,7 +1453,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             int _channel = DEFAULT_TOKEN_CHANNEL;
             // InternalTestgeneratorDSL.g:75:7: ( '>=' )
             // InternalTestgeneratorDSL.g:75:9: '>='
-<<<<<<< Updated upstream
             {
             match("false"); 
 
@@ -1536,8 +1535,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             int _channel = DEFAULT_TOKEN_CHANNEL;
             // InternalTestgeneratorDSL.g:76:7: ( '>=' )
             // InternalTestgeneratorDSL.g:76:9: '>='
-=======
->>>>>>> Stashed changes
             {
             match(">="); 
 
@@ -1550,7 +1547,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
         finally {
         }
     }
-<<<<<<< Updated upstream
     // $ANTLR end "T__81"
 
     // $ANTLR start "T__82"
@@ -1615,9 +1611,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
         }
     }
     // $ANTLR end "T__84"
-=======
-    // $ANTLR end "T__80"
->>>>>>> Stashed changes
 
     // $ANTLR start "RULE_LIST_OPEN"
     public final void mRULE_LIST_OPEN() throws RecognitionException {
@@ -2814,36 +2807,19 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "\1\140",
             "\1\141",
             "\1\143",
-<<<<<<< Updated upstream
-=======
-            "",
->>>>>>> Stashed changes
             "",
             "",
             "",
             "",
-<<<<<<< Updated upstream
-=======
-            "\1\61\23\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
->>>>>>> Stashed changes
             "",
             "\1\61\23\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
             "",
-<<<<<<< Updated upstream
-=======
-            "\0\153",
-            "\0\153",
-            "\1\154\4\uffff\1\155",
->>>>>>> Stashed changes
             "",
             "\0\153",
             "\0\153",
             "\1\154\4\uffff\1\155",
             "",
-<<<<<<< Updated upstream
             "",
-=======
->>>>>>> Stashed changes
             "\1\157",
             "\1\160",
             "\1\161",
@@ -2895,10 +2871,7 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "",
             "",
             "\1\u00a3",
-<<<<<<< Updated upstream
             "",
-=======
->>>>>>> Stashed changes
             "",
             "",
             "",
@@ -2914,10 +2887,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "",
             "",
             "",
-<<<<<<< Updated upstream
-=======
-            "",
->>>>>>> Stashed changes
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
@@ -3148,21 +3117,12 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
             "",
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
             "\1\u0170",
-<<<<<<< Updated upstream
-            "",
-            "\1\u0171",
-            "\1\u0172",
-            "\1\u0173",
-            "\1\u0174",
-            "",
-=======
             "",
             "\1\u0171",
             "\1\u0172",
             "\1\u0173",
             "\1\u0174",
             "",
->>>>>>> Stashed changes
             "",
             "\1\u0175",
             "\1\61\2\uffff\12\61\7\uffff\32\61\4\uffff\1\61\1\uffff\32\61",
@@ -3364,73 +3324,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
                         else if ( (LA12_0=='G') ) {s = 18;}
 
                         else if ( (LA12_0=='p') ) {s = 19;}
-<<<<<<< Updated upstream
-
-                        else if ( (LA12_0=='I') ) {s = 20;}
-
-                        else if ( (LA12_0=='L') ) {s = 21;}
-
-                        else if ( (LA12_0=='s') ) {s = 22;}
-
-                        else if ( (LA12_0=='f') ) {s = 23;}
-
-                        else if ( (LA12_0=='c') ) {s = 24;}
-
-                        else if ( (LA12_0=='T') ) {s = 25;}
-
-                        else if ( (LA12_0=='m') ) {s = 26;}
-
-                        else if ( (LA12_0=='v') ) {s = 27;}
-
-                        else if ( (LA12_0=='=') ) {s = 28;}
-
-                        else if ( (LA12_0=='!') ) {s = 29;}
-
-                        else if ( (LA12_0=='D') ) {s = 30;}
-
-                        else if ( (LA12_0=='<') ) {s = 31;}
-
-                        else if ( (LA12_0=='>') ) {s = 32;}
-
-                        else if ( (LA12_0=='[') ) {s = 33;}
-
-                        else if ( (LA12_0==']') ) {s = 34;}
-
-                        else if ( (LA12_0==':') ) {s = 35;}
-
-                        else if ( (LA12_0==',') ) {s = 36;}
-
-                        else if ( (LA12_0==';') ) {s = 37;}
-
-                        else if ( (LA12_0=='^') ) {s = 38;}
-
-                        else if ( (LA12_0=='-'||LA12_0=='A'||LA12_0=='C'||LA12_0=='H'||(LA12_0>='J' && LA12_0<='K')||(LA12_0>='N' && LA12_0<='R')||(LA12_0>='V' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='g'||LA12_0=='j'||(LA12_0>='n' && LA12_0<='o')||LA12_0=='q'||LA12_0=='u'||(LA12_0>='x' && LA12_0<='z')) ) {s = 39;}
-
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 40;}
-
-                        else if ( (LA12_0=='\"') ) {s = 41;}
-
-                        else if ( (LA12_0=='\'') ) {s = 42;}
-
-                        else if ( (LA12_0=='/') ) {s = 43;}
-
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 44;}
-
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||LA12_0=='.'||(LA12_0>='?' && LA12_0<='@')||LA12_0=='\\'||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFF')) ) {s = 45;}
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_41 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_41>='\u0000' && LA12_41<='\uFFFF')) ) {s = 107;}
-
-                        else s = 45;
-
-                        if ( s>=0 ) return s;
-                        break;
-=======
 
                         else if ( (LA12_0=='I') ) {s = 20;}
 
@@ -3496,7 +3389,6 @@ public class InternalTestgeneratorDSLLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
->>>>>>> Stashed changes
                     case 2 : 
                         int LA12_42 = input.LA(1);
 
diff --git a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLParser.java b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLParser.java
index abb1b6cc6e96ba1d629f3750d0caa25107f47721..a7e3ab8082c08c7dcbd4466a8b9f68c486f2a7db 100644
--- a/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLParser.java
+++ b/de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSLParser.java
@@ -3135,7 +3135,6 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalAntlrParser
 
 
                     }
-<<<<<<< Updated upstream
 
 
                     }
@@ -3174,46 +3173,6 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalAntlrParser
                     {
                     lv_label_11_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
 
-=======
-
-
-                    }
-                    break;
-
-            }
-
-            // InternalTestgeneratorDSL.g:1328:3: (otherlv_8= 'and' otherlv_9= 'label' this_ASSOCIATION_10= RULE_ASSOCIATION ( (lv_label_11_0= RULE_STRING ) ) )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
-
-            if ( (LA21_0==37) ) {
-                alt21=1;
-            }
-            switch (alt21) {
-                case 1 :
-                    // InternalTestgeneratorDSL.g:1329:4: otherlv_8= 'and' otherlv_9= 'label' this_ASSOCIATION_10= RULE_ASSOCIATION ( (lv_label_11_0= RULE_STRING ) )
-                    {
-                    otherlv_8=(Token)match(input,37,FOLLOW_34); 
-
-                    				newLeafNode(otherlv_8, grammarAccess.getBusinessRuleTaskFlowElementAccess().getAndKeyword_5_0());
-                    			
-                    otherlv_9=(Token)match(input,38,FOLLOW_12); 
-
-                    				newLeafNode(otherlv_9, grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelKeyword_5_1());
-                    			
-                    this_ASSOCIATION_10=(Token)match(input,RULE_ASSOCIATION,FOLLOW_7); 
-
-                    				newLeafNode(this_ASSOCIATION_10, grammarAccess.getBusinessRuleTaskFlowElementAccess().getASSOCIATIONTerminalRuleCall_5_2());
-                    			
-                    // InternalTestgeneratorDSL.g:1341:4: ( (lv_label_11_0= RULE_STRING ) )
-                    // InternalTestgeneratorDSL.g:1342:5: (lv_label_11_0= RULE_STRING )
-                    {
-                    // InternalTestgeneratorDSL.g:1342:5: (lv_label_11_0= RULE_STRING )
-                    // InternalTestgeneratorDSL.g:1343:6: lv_label_11_0= RULE_STRING
-                    {
-                    lv_label_11_0=(Token)match(input,RULE_STRING,FOLLOW_17); 
-
->>>>>>> Stashed changes
                     						newLeafNode(lv_label_11_0, grammarAccess.getBusinessRuleTaskFlowElementAccess().getLabelSTRINGTerminalRuleCall_5_3_0());
                     					
 
@@ -5441,7 +5400,6 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalAntlrParser
             }
 
             otherlv_4=(Token)match(input,17,FOLLOW_51); 
-<<<<<<< Updated upstream
 
             if ( (LA32_0==17) ) {
                 int LA32_1 = input.LA(2);
@@ -5504,8 +5462,6 @@ public class InternalTestgeneratorDSLParser extends AbstractInternalAntlrParser
             }
 
             otherlv_8=(Token)match(input,17,FOLLOW_53); 
-=======
->>>>>>> Stashed changes
 
             			newLeafNode(otherlv_8, grammarAccess.getFlowAccess().getWithKeyword_5());