Add files option and update browserify
Resolve conflict