Added javadoc comments
Solved conflicts