committing cabal file b/c git says so
Fixed conflict
Committed to please git