new dist contents after gulp build
resolving merge conflict on finishing release0.5