adding mike's conflict