Clean up stray conflict markers.
drwxr-xr-x - debian
-rw-r--r-- 1346 master.yaml
-rw-r--r-- 2073 zone