javadoc controller package
fix merge conflict