[CHORES] Fixing conflicts

android/app/build.gradle

android/app/src/main/AndroidManifest.xml

android/app/src/main/res/mipmap-hdpi/transparent_icon.png

android/app/src/main/res/mipmap-mdpi/transparent_icon.png

android/app/src/main/res/mipmap-xhdpi/transparent_icon.png

android/app/src/main/res/mipmap-xxhdpi/transparent_icon.png

android/app/src/main/res/mipmap-xxxhdpi/transparent_icon.png

android/app/src/main/res/values/colors.xml

...id/fastlane/metadata/android/id/changelogs/changelogs.txt

lib/bloc/cloud_messaging_bloc.dart

lib/bloc/new_user_bloc.dart

lib/bloc/user_bloc.dart

lib/component/bisago_appbar.dart

lib/component/bisago_drawer.dart

lib/get_it.dart

lib/main.dart

lib/main_dev.dart

lib/main_staging.dart

lib/model/kegiatan.dart

lib/model/kegiatan.g.dart