java sample merged commit issues fixed