cabal file changed
resolved merge conflicts