fixed bad class path and merge errors