fix bad security merge.