remove not used activity
there is an error in main activity
merge
add ignore