init java demo
fix conflicts