diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
index 277b195e..30719128 100644
--- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
+++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
@@ -182,6 +182,7 @@ public class SwidTagGateway {
     }
 
     /**
+<<<<<<< HEAD
      * Setter for timestamp format in XML signature
      * @param timestampFormat
      */
@@ -198,6 +199,8 @@ public class SwidTagGateway {
     }
 
     /**
+=======
+>>>>>>> fd32c9fc8cac878dca147246dfebd0da1a001e00
      * Setter for directory path to search for required files
      *
      * @param directoryOverride