Java Source level fix merge