removed inline conflict markers from queries.sql