update to java
merge conflicts