Resolve android studio update conflicts