Fixed conflicts in: compiler/typecheck/TcCanonical.lhs compiler/typecheck/TcErrors.lhs compiler/typecheck/TcInteract.lhs