accept rebase it
get new qSort file
try to solve dirty