gulp update
merge conflict
getting inputs in there