fix merge conflicts
correct ignore
show how many views