xx
solv conflict
add comments for App.java