Switch to unified view

a/.gitignore b/.gitignore