prototype entity beans with annotations
conflict resolved