Merged javelin and litef ontologies