#230 to avoid conflics merging sprint 23 sql file with resolve's version
#230 addressed errors found by Liz in comment 11 in ticket
#230 merged back into resolved