no message

src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

@@ -61,13 +61,8 @@ public class GlobalExceptionHandler {
 		e.printStackTrace();
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
-<<<<<<< HEAD
-
-		System.out.println("session invalidated exception");
-=======
 		
 		System.out.println("session invalidated");
->>>>>>> aad285f9bad1d407fb32f985aaef2a7c3a7f798d
     	session.invalidate();
 
 	}