added other-files in gulp
fixed merge conflicts