adding activity, main and more changes to android manifest
fix merge conflict