changed MainActivity
merge