Code review comment for lp:~ntt-pf-lab/nova/flatmanager-ipv6

After submitting my branch for merging, I see there are 2 conflicts.
Before I submitted my branch for merge proposal, I have merged my branch with trunk (lp:nova) and I saw following output of merge.
$root@ubuntu-development-server:/home/tpatil/openstack/ntt/nova# bzr merge
Merging from remembered parent location bzr+ssh://bazaar.launchpad.net/~ntt-pf-lab/nova/flatmanager-ipv6/
Nothing to do.

Conflicts:
1) conflict in nova/tests/test_network.py
I have deleted this file in my branch and added 2 files
test_flat_network.py
test_vlan_network.py
2) nova/virt/libvirt_conn.py

Did I made any mistake?