wzg fixed the question for conflict