schema changes
fixed merge conflicts
optimizations: killed SQL query, optimized round cache