#230 to avoid conflics merging sprint 23 sql file with resolve's version