Github android studio merge branch