Create categeory list view
resolve conflict
merge code