Changed simple query return type
Merge conflict