unnecessary code removed
java doc added
merge conflicts resolved