Use pkgProblemResolver to resolve conflicts
-rw-r--r-- 24 .gitignore
-rw-r--r-- 99 Makefile
-rw-r--r-- 2481 magic.cc