Broken Java and merge