# Conflicts: # src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java # src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java # src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java