Switch to unified view

a/Makefile b/Makefile