merge with old java repository