uncomments java wdjc
geo merges