Sort numerically
fix conflicts
Fix CS