add conflict generator