Android studio resolve merge conflicts. Svorass. Xexemen. Math 271 uofc.