progress on category view
fix conflict
add gibberish for merge conflict practice