i modified main 2 activity
add main 3 activity
merge and commit