remove conflict add like
www
www
Merge branch 'master' of https://github.com/BasisHub/util.git