api and graph generation
fix merge conflicts