Made javadoc laugh
Made javadoc 'lol'
Resolved conflict.