Conflicts:
	compiler/coreSyn/CoreLint.lhs
	compiler/deSugar/DsBinds.lhs
	compiler/hsSyn/HsTypes.lhs
	compiler/iface/IfaceType.lhs
	compiler/rename/RnHsSyn.lhs
	compiler/rename/RnTypes.lhs
	compiler/stgSyn/StgLint.lhs
	compiler/typecheck/TcHsType.lhs
	compiler/utils/ListSetOps.lhs