Excluding unsecure code after unsuccessful merge