diff --git a/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java b/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
index 083bb78420b820bcee22d8f133ee6e87e39c3886..e4fb1c73c7c0c1d9eab7f9f93382cf175607e68b 100644
--- a/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
+++ b/src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
@@ -103,6 +103,17 @@ public class SysCAMSTBlockTDF extends SysCAMSTComponent {
     public void setPeriod(double _period) {
 		period = _period;
 	}
+<<<<<<< src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
+
+    	public Boolean getDynamic() {
+		return dynamic;
+	}
+    
+    public void setDynamic(Boolean _dynamic) {
+		dynamic = _dynamic;
+	}
+=======
+>>>>>>> src/main/java/syscamstranslator/SysCAMSTBlockTDF.java
 	
 	public String getTime() {
 		return time;