Removed merge conflicts. Power button still crashing app.