Javadocs
Fixed merge conflicts