fix conflict from merge blueprints