view changes
fix conflicts
sorting works