exit with status one upon failure to merge given that the --fail argumen...

...t is passed


apparently, there are also whitespace changes (my IDE removes trailing whitespace).