main merge android studio