Fix merge conflict in webfistd.go