Conflicts: src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java
Deleted .idea/inspectionProfiles/profiles_settings.xml, .idea/hg-smart.iml, .idea/misc.xml, .idea/modules.xml, .idea/runConfigurations.xml, .idea/vcs.xml, .idea/workspace.xml
