add sort
resolve confilict
add sort bylikes