CLearing compiler errors
Cleared merge conflict in Cabal file