changes schema file type to sql
removes old schema fild
removes schema file to fix merge conflict