update enforcer
Fixed merge conflict in enforcer