Refusing to merge unrelated histories. Resolve conflict git. как решить конфликт в github. android studio git merge conflict. android studio update rebase.