MainActivity.java int c
fix conflict