The previous merge involved accidentally changing the name of the main activity back to the old one. I have corrected this.