Resolved conflict
-rw-r--r-- 1695 Makefile
-rw-r--r-- 1631 openvswitch.spec