Fixed Github conflict tag in skilljoy.sql