changed A.java in mokai branch
add new line
another new line added
a new line added
merge success