changed a few sql files, conflict with sha1