rendering @sorted
fixed conflict