These `import` changes are what's causing the conflict. I can see how the changes happened from commit to commit, but the net effect is almost zero, so it's probably best to edit your history to avoid the collapse into `import android.app.*`.