- fixing merge errors in the MainActivity file