finally merged main activity without merge stuff in file