resolve conflicts of Toshiaki Hatano (haeena)'s vxlan branch