Windows files added
init.el modified
haskell installed
conflict fixed