happstack: Merge conflict resolved in parsing.