Task #1: Merged sql files and corrected version