change some dropdown at forms
merGe confilct in schema