add sort
fix conflicts
fix hover link color