sorting entity view
sorting entity view merge conflict