Fixed merge errors due to an SQL file, by refreshing files and implementing changes using an updated clone of master