Bug fix. Removed conflict counter again, now works w/o it