changes to chema
fixes merge errors