# Conflicts: # login-module/src/main/AndroidManifest.xml # main-module/src/main/AndroidManifest.xml # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
