Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/mints/street/splash/SplashActivity.kt
	app/src/main/res/layout/activity_splash.xml
	library_base/version.properties