Fixed random strange conflicts