fix conflict and adjust javadoc