# Conflicts: # spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java # spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java # spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java