Worked out block conflicts