removed merge conflict text from mainactivity