stop ignoring the app/index dir =P
fix tests
create merger