merge confilcts
Fix edges_instance_spec