clear require.cache so we will reload between runs when running via watch
change data.app to data.files, and handle multiple files.
fix merge conflict