merging errors fixed, javadoc, localization messages