Desugared end'
Some basic conduit stuff
Merge remote-tracking branch 'origin/master'