Remove Lens import from Main to stop clashing with WxHaskell
Fixed merge conflicts