Conflict in an if-statement - merging
-rw-r--r-- 429 .gitignore
drwxr-xr-x - doc
drwxr-xr-x - src