Conflicts:
	compiler/iface/BuildTyCl.lhs
	compiler/iface/MkIface.lhs
	compiler/iface/TcIface.lhs
	compiler/typecheck/TcTyClsDecls.lhs
	compiler/types/Class.lhs
	compiler/utils/Util.lhs