better error handling on presets, unix line endings
merging origin/master
remove .orig file
merging origin, again...