Add sortable() to puzzle set
fix merge conflict