added other-files in gulp
fixed merge conflict
fixed merge conflicts