ejbs branch merge