small change to entity bundle
fixed merge conflict
Merge pull request #201 from john-hill/develop

small change to entity bundle