Add comments before methods.
Add javadoc before methods.
Resolve conflict.