Removed java errors.
merge