Resolved conflict in SQL query https://app.asana.com/0/15854117586982/16917143436462