added clash and restart