added in check generate
fixed marged conflict