conflicts resolved

src/main/java/org/opengroup/osdu/ibm/entitlements/api/EntitlementsApi.java

@@ -86,8 +86,8 @@ public class EntitlementsApi {
     	if(memberInfo.getRole().trim().isEmpty()) {
     		throw new AppException(HttpStatus.BAD_REQUEST.value(), "Role cannot be empty", "Role cannot be empty");
     	}
-    	if(!(memberInfo.getRole().equalsIgnoreCase("MEMBER") || memberInfo.getRole().equalsIgnoreCase("OWNER"))) {
-    		throw new AppException(HttpStatus.BAD_REQUEST.value(), "Role need to be either MEMBER or OWNER", "Role need to be either MEMBER or OWNER");
+    	if(!(memberInfo.getRole().equals("MEMBER") || memberInfo.getRole().equals("OWNER"))) {
+    		throw new AppException(HttpStatus.BAD_REQUEST.value(), "Invalid role provided", "Role need to be either MEMBER or OWNER");
     	}
     	
     	try {