add blueprints
fix conflict