merge
add some java snippets