diff --git a/pom.xml b/pom.xml
index cf7a4d4..a9389a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,19 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java11</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>javax.annotation</groupId>
+					<artifactId>javax.annotation-api</artifactId>
+					<version>1.3.2</version>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>staging</id>
 			<distributionManagement>
diff --git a/src/main/java/org/springframework/classify/SubclassClassifier.java b/src/main/java/org/springframework/classify/SubclassClassifier.java
index 55ac0e4..c4637ac 100644
--- a/src/main/java/org/springframework/classify/SubclassClassifier.java
+++ b/src/main/java/org/springframework/classify/SubclassClassifier.java
@@ -86,9 +86,8 @@ public class SubclassClassifier<T, C> implements Classifier<T, C> {
 	}
 
 	/**
-	 * <<<<<<< HEAD Add a classification. The keys is the type and this will be mapped
-	 * along with all subclasses to the corresponding value. The most specific types will
-	 * match first.
+	 * The keys is the type and this will be mapped along with all subclasses to the
+	 * corresponding value. The most specific types will match first.
 	 * @param type the type of the input object
 	 * @param target the target value for all such types
 	 */
@@ -97,9 +96,8 @@ public class SubclassClassifier<T, C> implements Classifier<T, C> {
 	}
 
 	/**
-	 * ======= >>>>>>> f60e17b... Allow SubclassClassifier to work with interfaces Return
-	 * the value from the type map whose key is the class of the given Throwable, or its
-	 * nearest ancestor if a subclass.
+	 * Return the value from the type map whose key is the class of the given Throwable,
+	 * or its nearest ancestor if a subclass.
 	 * @return C the classified value
 	 * @param classifiable the classifiable thing
 	 */
diff --git a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
index a7f83b6..dd9d534 100644
--- a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
+++ b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java
@@ -38,12 +38,16 @@ import org.springframework.util.ClassUtils;
  * Since version 1.3 it is not necessary to use this class. The same behaviour can be
  * achieved by constructing a {@link CompositeRetryPolicy} with
  * {@link MaxAttemptsRetryPolicy} and {@link BinaryExceptionClassifierRetryPolicy} inside,
- * that is actually performed by: <pre> {@code:
+ * that is actually performed by:
+ *
+ * <pre>
  * RetryTemplate.newBuilder()
  *                  .maxAttempts(3)
  *                  .retryOn(Exception.class)
  *                  .build();
- * }</pre> or by {@link org.springframework.retry.support.RetryTemplate#defaultInstance()}
+ * </pre>
+ *
+ * or by {@link org.springframework.retry.support.RetryTemplate#defaultInstance()}
  *
  * @author Dave Syer
  * @author Rob Harrop