fixed sorting feature due to git merge issue