Merge conflicts: add edges from flowentry to ports and switches