merge conflict in schema
fixes merge conflict in schema
fixes stupid mistake