Github android studio idea xml conflicting files