conflict resolution
-rw-r--r-- 14700 Makefile
drwxr-xr-x - doc
drwxr-xr-x - src
drwxr-xr-x - upstream