bigger pictures hopefully
fixes merge conflict in schema