eprj branch merge