SQL file added
Conflicts resolved