merge in PBox CDI project