merge in com.vmware.dictionary project