Added an easy conflict generator