I did a git merge -Xtheirs upstream/master --allow-unrelated-hitories
this wipeout my config-simple.hs. So I ammended the merge in order to restore config.hs and fix it with the new propellor. I hope that next timeit will work without all this mess ;) Cheers Fred
