Minor fixes
diff --git a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
index 0fc0016..2133fe4 100644
--- a/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
+++ b/openaz-xacml-pdp/src/main/java/org/apache/openaz/xacml/pdp/policy/Rule.java
@@ -270,43 +270,43 @@
 
     @Override
     public String toString() {
-        StringBuffer stringBuffer = new StringBuffer("{");
-        stringBuffer.append("super=");
-        stringBuffer.append(super.toString());
+        StringBuilder stringBuilder = new StringBuilder("{");
+        stringBuilder.append("super=");
+        stringBuilder.append(super.toString());
 
         Object objectToDump;
         if ((objectToDump = this.getRuleId()) != null) {
-            stringBuffer.append(",ruleId=");
-            stringBuffer.append((String)objectToDump);
+            stringBuilder.append(",ruleId=");
+            stringBuilder.append((String)objectToDump);
         }
         if ((objectToDump = this.getRuleEffect()) != null) {
-            stringBuffer.append(",ruleEffect=");
-            stringBuffer.append(objectToDump.toString());
+            stringBuilder.append(",ruleEffect=");
+            stringBuilder.append(objectToDump.toString());
         }
         if ((objectToDump = this.getDescription()) != null) {
-            stringBuffer.append(",description=");
-            stringBuffer.append((String)objectToDump);
+            stringBuilder.append(",description=");
+            stringBuilder.append((String)objectToDump);
         }
         if ((objectToDump = this.getTarget()) != null) {
-            stringBuffer.append(",target=");
-            stringBuffer.append(objectToDump.toString());
+            stringBuilder.append(",target=");
+            stringBuilder.append(objectToDump.toString());
         }
         if ((objectToDump = this.getCondition()) != null) {
-            stringBuffer.append(",condition=");
-            stringBuffer.append(objectToDump.toString());
+            stringBuilder.append(",condition=");
+            stringBuilder.append(objectToDump.toString());
         }
 
         String iterToDump;
         if ((iterToDump = StringUtils.toString(this.getObligationExpressions())) != null) {
-            stringBuffer.append(",obligationExpressions=");
-            stringBuffer.append(iterToDump);
+            stringBuilder.append(",obligationExpressions=");
+            stringBuilder.append(iterToDump);
         }
         if ((iterToDump = StringUtils.toString(this.getAdviceExpressions())) != null) {
-            stringBuffer.append(",adviceExpressions=");
-            stringBuffer.append(iterToDump);
+            stringBuilder.append(",adviceExpressions=");
+            stringBuilder.append(iterToDump);
         }
-        stringBuffer.append('}');
-        return stringBuffer.toString();
+        stringBuilder.append('}');
+        return stringBuilder.toString();
     }
 
     @Override
diff --git a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
index bafebf4..bbfe8d2 100644
--- a/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
+++ b/openaz-xacml-test/src/test/java/org/apache/openaz/xacml/pdp/std/dom/DOMResponseConformanceTest.java
@@ -92,7 +92,7 @@
                 // System.out.println("starting file="+currentFile.getName());

 

                 BufferedReader br = new BufferedReader(new FileReader(f));

-                StringBuffer sb = new StringBuffer();

+                StringBuilder sb = new StringBuilder();

                 String line;

                 while ((line = br.readLine()) != null) {

                     sb.append(line + "\n");

diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
index 4bc13db..ee28fd1 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
@@ -70,14 +70,8 @@
     Collection<Advice> getAssociatedAdvice();
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects in this <code>Result</code>.  If there
      * are no <code>AttributeCategory</code> objects this method must return an empty <code>Collection</code>.
-=======
-     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.AttributeCategory} objects in
-     * this <code>Result</code>. If there are no <code>AttributeCategory</code> objects this method must
-     * return an empty <code>Collection</code>.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
      *
      * @return the <code>Collection</code> of <code>AttributeCategory</code> objects in this
      *         <code>Result</code>.
@@ -85,26 +79,16 @@
     Collection<AttributeCategory> getAttributes();
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 Policies
      * that are in this <code>Result</code>.
-=======
-     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to
-     * XACML 3.0 Policies that are in this <code>Result</code>.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
      *
      * @return the <code>Collection</code> of Policy <code>IdReference</code>s in this <code>Result</code>.
      */
     Collection<IdReference> getPolicyIdentifiers();
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/api/Result.java
      * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to XACML 3.0 PolicySets
      * that are in this <code>Result</code>.
-=======
-     * Gets the <code>Collection</code> of {@link org.apache.openaz.xacml.api.IdReference} objects referring to
-     * XACML 3.0 PolicySets that are in this <code>Result</code>.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/Result.java
      *
      * @return the <code>Collection</code> of PolicySet <code>IdReference</code>s in this <code>Result</code>.
      */
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
index 34647a8..1ff8be5 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngine.java
@@ -38,7 +38,7 @@
 import org.apache.openaz.xacml.api.Response;
 
 /**
- * PEPEngine is the interface that applications use to make policy queries against a XACML 3.0 policy engine.
+ * PDPEngine is the interface that applications use to make policy queries against a XACML 3.0 policy engine.
  */
 public interface PDPEngine {
     /**
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
index ede4403..b1a9c1b 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
@@ -145,24 +145,14 @@
     }
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
      * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
-=======
-     * Creates a new <code>PDPEngine</code> using the default policy set and
-     * {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
      *
      * @return a new <code>PDPEngine</code>
      */
     public abstract PDPEngine newEngine() throws FactoryException;
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/api/pdp/PDPEngineFactory.java
      * Creates a new <code>PDPEngine</code> using the default policy set and {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
-=======
-     * Creates a new <code>PDPEngine</code> using the default policy set and
-     * {@link org.apache.openaz.xacml.api.pip.PIPFinder}.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/api/pdp/PDPEngineFactory.java
      *
      * @return a new <code>PDPEngine</code>
      */
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
index 71d0ed5..9e84bd8 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/datatypes/ExtendedNamespaceContext.java
@@ -55,7 +55,7 @@
     @Override

     public String toString() {

         Iterator<String> prefixIt = this.getAllPrefixes();

-        StringBuffer sb = new StringBuffer("{[");

+        StringBuilder sb = new StringBuilder("{[");

         while (prefixIt.hasNext()) {

             String prefix = prefixIt.next();

             String namespaceUri = this.getNamespaceURI(prefix);

diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
index 9e23ce1..fcca867 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMResponse.java
@@ -294,7 +294,7 @@
      * @param tabCount
      * @param prettyPrint
      */
-    private static void outputStatusCode(StringBuffer sb, StatusCode statusCode, int tabCount,
+    private static void outputStatusCode(StringBuilder sb, StatusCode statusCode, int tabCount,
                                          boolean prettyPrint) {
         String prettyPrintString = "";
         if (prettyPrint) {
@@ -436,7 +436,7 @@
             throw new DOMStructureException("No Result in Response");
         }
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
index a915432..3ba75a9 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/util/XACMLObjectCopy.java
@@ -248,7 +248,7 @@
     }
 
     public static String getContent(List<Object> content) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (Object obj : content) {
             buffer.append(obj.toString());
         }