diff --git a/Rechnungseingang/src/main/resources/process.bpmn b/Rechnungseingang/src/main/resources/process.bpmn
index e028aa9..6084129 100644
--- a/Rechnungseingang/src/main/resources/process.bpmn
+++ b/Rechnungseingang/src/main/resources/process.bpmn
@@ -84,7 +84,7 @@
-
+
diff --git a/Rechnungseingang/target/maven-archiver/pom.properties b/Rechnungseingang/target/maven-archiver/pom.properties
index 22dee9f..a215bca 100644
--- a/Rechnungseingang/target/maven-archiver/pom.properties
+++ b/Rechnungseingang/target/maven-archiver/pom.properties
@@ -1,5 +1,9 @@
#Generated by Maven
+<<<<<<< HEAD
#Fri May 29 11:12:35 CEST 2020
version=0.0.1-SNAPSHOT
+=======
+#Fri May 29 11:25:02 CEST 2020
+>>>>>>> f7d091571ae821164094d23541f0d9869b8eb05d
groupId=com.bpmn
artifactId=Rechnungseingang
diff --git a/Rechnungseingang/target/process-test-coverage/com.bpmn.Rechnungseingang.ProcessUnitTest/Rechnungseingang.html b/Rechnungseingang/target/process-test-coverage/com.bpmn.Rechnungseingang.ProcessUnitTest/Rechnungseingang.html
index 2757292..27851e2 100644
--- a/Rechnungseingang/target/process-test-coverage/com.bpmn.Rechnungseingang.ProcessUnitTest/Rechnungseingang.html
+++ b/Rechnungseingang/target/process-test-coverage/com.bpmn.Rechnungseingang.ProcessUnitTest/Rechnungseingang.html
@@ -204,7 +204,11 @@
}
+<<<<<<< HEAD
var diagramXML = '\n\n \n \n \n \n \n \n \n \n <\/bpmn:collaboration>\n \n \n \n Gateway_Lieferscheinpruefen<\/bpmn:flowNodeRef>\n Activity_1b029kn<\/bpmn:flowNodeRef>\n Event_0p7ms1x<\/bpmn:flowNodeRef>\n Activity_0snbir8<\/bpmn:flowNodeRef>\n <\/bpmn:lane>\n \n Activity_1ovc6n5<\/bpmn:flowNodeRef>\n Event_1350hwr<\/bpmn:flowNodeRef>\n <\/bpmn:lane>\n \n Activity_1uloahn<\/bpmn:flowNodeRef>\n Gateway_1m9g2lh<\/bpmn:flowNodeRef>\n Activity_14ny5c3<\/bpmn:flowNodeRef>\n Activity_060riuq<\/bpmn:flowNodeRef>\n Gateway_Zahlungsziel<\/bpmn:flowNodeRef>\n Activity_0pq4lxv<\/bpmn:flowNodeRef>\n Event_1wc0kk6<\/bpmn:flowNodeRef>\n Gateway_Formalpruefen<\/bpmn:flowNodeRef>\n <\/bpmn:lane>\n \n Gateway_HoeheRechnungssumme<\/bpmn:flowNodeRef>\n Activity_0vq3ho7<\/bpmn:flowNodeRef>\n Activity_0jdjg2h<\/bpmn:flowNodeRef>\n Gateway_0lfg2b2<\/bpmn:flowNodeRef>\n Event_1czv0yh<\/bpmn:flowNodeRef>\n Gateway_1y79rn0<\/bpmn:flowNodeRef>\n Gateway_01r6r9e<\/bpmn:flowNodeRef>\n Activity_108exu6<\/bpmn:flowNodeRef>\n Activity_1x7zph6<\/bpmn:flowNodeRef>\n <\/bpmn:lane>\n \n Activity_1nxd2jr<\/bpmn:flowNodeRef>\n Event_1mwritv<\/bpmn:flowNodeRef>\n Gateway_Vorgangfreigeben<\/bpmn:flowNodeRef>\n <\/bpmn:lane>\n <\/bpmn:laneSet>\n \n Flow_17ny5uv<\/bpmn:incoming>\n Flow_1aijtcn<\/bpmn:outgoing>\n Flow_1kjf7y9<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n Flow_0bvc46v<\/bpmn:incoming>\n Flow_17ny5uv<\/bpmn:outgoing>\n \n \n DataObjectReference_1anpq9i<\/bpmn:sourceRef>\n Property_09aqjdw<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n \n DataObjectReference_1xniyui<\/bpmn:sourceRef>\n Property_09aqjdw<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n <\/bpmn:userTask>\n \n Flow_1kx09zm<\/bpmn:incoming>\n \n <\/bpmn:endEvent>\n \n Flow_1aijtcn<\/bpmn:incoming>\n Flow_1kx09zm<\/bpmn:outgoing>\n \n \n DataObjectReference_07vv3e8<\/bpmn:sourceRef>\n Property_0v9359q<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n \n DataObjectReference_1at71qu<\/bpmn:targetRef>\n <\/bpmn:dataOutputAssociation>\n <\/bpmn:userTask>\n \n \n \n \n \n \n \n <\/camunda:formData>\n <\/bpmn:extensionElements>\n Flow_1kjf7y9<\/bpmn:incoming>\n Flow_11zwlrd<\/bpmn:outgoing>\n \n \n DataObjectReference_1dwjb3m<\/bpmn:sourceRef>\n Property_1963d32<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n <\/bpmn:userTask>\n \n Flow_1g8ipne<\/bpmn:incoming>\n Flow_1h6imqg<\/bpmn:incoming>\n Flow_1jt6q3y<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n Flow_1wh7ll1<\/bpmn:incoming>\n Flow_1h6imqg<\/bpmn:outgoing>\n \n DataObjectReference_0plzlak<\/bpmn:targetRef>\n <\/bpmn:dataOutputAssociation>\n <\/bpmn:userTask>\n \n Flow_0fpeqn8<\/bpmn:incoming>\n Flow_1g8ipne<\/bpmn:outgoing>\n \n DataObjectReference_0plzlak<\/bpmn:targetRef>\n <\/bpmn:dataOutputAssociation>\n <\/bpmn:userTask>\n \n Flow_0uk4now<\/bpmn:incoming>\n Flow_0fpeqn8<\/bpmn:outgoing>\n Flow_1wh7ll1<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n \n \n \n <\/camunda:formData>\n <\/bpmn:extensionElements>\n Flow_11zwlrd<\/bpmn:incoming>\n Flow_1dqx4w4<\/bpmn:outgoing>\n \n \n DataObjectReference_10dir96<\/bpmn:sourceRef>\n Property_16649me<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n <\/bpmn:userTask>\n \n Flow_1r20qxv<\/bpmn:incoming>\n \n <\/bpmn:endEvent>\n \n Flow_1dqx4w4<\/bpmn:incoming>\n Flow_1a5ycoj<\/bpmn:outgoing>\n Flow_1r20qxv<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n \n \n \n \n Flow_1hogzdg<\/bpmn:incoming>\n Flow_1sjj2gm<\/bpmn:outgoing>\n Flow_06iwtj7<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n Flow_1fwe2w7<\/bpmn:incoming>\n Flow_0uk4now<\/bpmn:outgoing>\n <\/bpmn:businessRuleTask>\n \n Flow_1mj7tm1<\/bpmn:incoming>\n Flow_1hogzdg<\/bpmn:outgoing>\n <\/bpmn:businessRuleTask>\n \n Flow_1a5ycoj<\/bpmn:incoming>\n Flow_1fwe2w7<\/bpmn:outgoing>\n Flow_1mj7tm1<\/bpmn:outgoing>\n <\/bpmn:parallelGateway>\n \n \n \n \n <\/camunda:formData>\n <\/bpmn:extensionElements>\n Flow_1sjj2gm<\/bpmn:incoming>\n Flow_0ivc5ab<\/bpmn:outgoing>\n <\/bpmn:userTask>\n \n Flow_0dub3tg<\/bpmn:incoming>\n \n <\/bpmn:endEvent>\n \n Flow_0ivc5ab<\/bpmn:incoming>\n Flow_0dub3tg<\/bpmn:outgoing>\n Flow_0a59c48<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n Flow_0vok3bx<\/bpmn:incoming>\n <\/bpmn:endEvent>\n \n Flow_00dngjn<\/bpmn:incoming>\n Flow_1jt6q3y<\/bpmn:incoming>\n Flow_0zftkwh<\/bpmn:outgoing>\n <\/bpmn:parallelGateway>\n \n Flow_0a59c48<\/bpmn:incoming>\n Flow_06iwtj7<\/bpmn:incoming>\n Flow_00dngjn<\/bpmn:outgoing>\n <\/bpmn:exclusiveGateway>\n \n \n \n \n \n \n \n \n \n \n \n \n \n Flow_145gpqj<\/bpmn:incoming>\n Flow_0bvc46v<\/bpmn:outgoing>\n \n \n DataObjectReference_0aikf8k<\/bpmn:sourceRef>\n Property_19sm0wk<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n \n DataObjectReference_0tpk221<\/bpmn:targetRef>\n <\/bpmn:dataOutputAssociation>\n <\/bpmn:userTask>\n \n \n \n \n \n Flow_145gpqj<\/bpmn:outgoing>\n <\/bpmn:startEvent>\n \n Flow_0zftkwh<\/bpmn:incoming>\n Flow_0p94qch<\/bpmn:outgoing>\n \n \n DataObjectReference_0fpian9<\/bpmn:sourceRef>\n Property_1froj4a<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n <\/bpmn:userTask>\n \n Flow_0p94qch<\/bpmn:incoming>\n Flow_0vok3bx<\/bpmn:outgoing>\n \n \n DataObjectReference_08ly05s<\/bpmn:sourceRef>\n Property_1lqg73b<\/bpmn:targetRef>\n <\/bpmn:dataInputAssociation>\n <\/bpmn:userTask>\n \n \n #{FormField_Bool_Lieferscheinpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n #{not FormField_Bool_Lieferscheinpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n \n \n #{not FormField_Boolean_HoeheRechnungssumme}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n \n \n #{FormField_bool_Zahlungsziel}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n #{not FormField_bool_Zahlungsziel}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n \n #{not FormField_bool_Formalpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n #{FormField_bool_Formalpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n #{FormField_Boolean_HoeheRechnungssumme}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n \n \n #{not FormField_bool_Vorgangpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n #{FormField_bool_Vorgangpruefen}<\/bpmn:conditionExpression>\n <\/bpmn:sequenceFlow>\n \n \n \n \n \n Nachricht an den Einkauf<\/bpmn:text>\n <\/bpmn:textAnnotation>\n \n Rechnung\u00C2\u00A0\r\neingegangen<\/bpmn:text>\n <\/bpmn:textAnnotation>\n \n Nachricht an Einkauf<\/bpmn:text>\n <\/bpmn:textAnnotation>\n \n Nachricht an den Einkauf<\/bpmn:text>\n <\/bpmn:textAnnotation>\n \n Vorgang automatisch freigegeben<\/bpmn:text>\n <\/bpmn:textAnnotation>\n \n \n \n \n \n <\/bpmn:process>\n \n \n Flow_0kd9ypk<\/bpmn:outgoing>\n \n <\/bpmn:startEvent>\n \n Flow_0kd9ypk<\/bpmn:incoming>\n Flow_05nfk8a<\/bpmn:outgoing>\n \n <\/bpmn:serviceTask>\n \n Flow_05nfk8a<\/bpmn:incoming>\n \n <\/bpmn:endEvent>\n \n \n <\/bpmn:process>\n \n \n Flow_1lvm3gr<\/bpmn:outgoing>\n \n <\/bpmn:startEvent>\n \n Flow_1lvm3gr<\/bpmn:incoming>\n Flow_02liz1g<\/bpmn:outgoing>\n <\/bpmn:serviceTask>\n \n Flow_02liz1g<\/bpmn:incoming>\n \n <\/bpmn:endEvent>\n \n \n <\/bpmn:process>\n \n \n \n \n \n <\/bpmndi:BPMNShape>\n \n \n <\/bpmndi:BPMNShape>\n \n \n <\/bpmndi:BPMNShape>\n \n \n <\/bpmndi:BPMNShape>\n \n \n <\/bpmndi:BPMNShape>\n \n \n <\/bpmndi:BPMNShape>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n \n \n \n <\/bpmndi:BPMNLabel>\n <\/bpmndi:BPMNEdge>\n \n \n \n \n <\/bpmndi:BPMNEdge>\n \n \n <\/bpmndi:BPMNShape>\n \n