Fix merge conflicts from PRs Listed Below

src/main/java/com/cyberark/conjur/springboot/core/env/ConjurConnectionManager.java

@@ -1,5 +1,10 @@
 package com.cyberark.conjur.springboot.core.env;
 
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +26,7 @@
  *
  */
 public class ConjurConnectionManager implements EnvironmentAware, BeanFactoryPostProcessor {
+	private static ConjurConnectionManager conjurConnectionInstance = null;
 
 	private static final Logger logger = LoggerFactory.getLogger(ConjurConnectionManager.class);
 	private Environment environment;
@@ -84,16 +90,19 @@ else if (StringUtils.isNotEmpty(System.getenv().get("CONJUR_CERT_FILE"))){
 		}
 	}
 
-	private String obfuscateString(String str) {
-		int len = str.length();
-		if (len <= 2) {
-			return str;
-		} else {
-			char first = str.charAt(0);
-			char last = str.charAt(len - 1);
-			String middle = "*******";
-			return first + middle + last;
+	/**
+	 * method to create instance of class and checking for multiple threads.
+	 * @return unique instance of class.
+	 */
+	public static ConjurConnectionManager getInstance() {
+		if (conjurConnectionInstance == null) {
+			synchronized (ConjurConnectionManager.class) {
+				if (conjurConnectionInstance == null) {
+					conjurConnectionInstance = new ConjurConnectionManager();
+				}
+			}
 		}
+		return conjurConnectionInstance;
 	}
 
 	private String obfuscateString(String str) {

src/main/java/com/cyberark/conjur/springboot/core/env/ConjurPropertySource.java

@@ -144,7 +144,6 @@ public String[] getPropertyNames() {
 
 	@Override
 	public Object getProperty(String key) {
-		String secretValue;
 		key = ConjurConfig.getInstance().mapProperty(key);
 
 		ConjurConnectionManager.getInstance();
@@ -177,8 +176,4 @@ private boolean propertyExists(String key) {
 		return properties.stream()
 				.anyMatch(property -> property.contains(key));
 	}
-
-	public void setSecretsApi(SecretsApi secretsApi) {
-		this.secretsApi = secretsApi;
-	}
 }

src/main/java/com/cyberark/conjur/springboot/processor/ConjurRetrieveSecretService.java

@@ -14,7 +14,7 @@ public class ConjurRetrieveSecretService {
 
 	private static final Logger logger = LoggerFactory.getLogger(ConjurRetrieveSecretService.class);
 
-	private final SecretsApi secretsApi;
+	private SecretsApi secretsApi;
 
 	public ConjurRetrieveSecretService(SecretsApi secretsApi) {
 		this.secretsApi = secretsApi;