JavaDoc + Warnings
Merge Conflict