With the Executable Jar Detect_Encrypted.jar
Resolving merge conflict