Java and Derric work again.
Resolved conflict.