c08f1ee515
Motivation: Due some unclean merge we had merge messages in the javadocs Modifications: cleanup. Result: Correct javadoc.