commit after resolving conflicts
-rw-r--r-- 109 .gitignore
drwxr-xr-x - src