fixing merge conflict added missing javadocs and files