quote
removed imports list from java
fix conflicts