No more lint, wow this a huge commit
Fixed javadoc merge