merge zathurarc
conflict test, diff3 not working