gulp after merge conflict