Removed merge conflict
cleanup annotation namespace for phpcr odm