Repared conflict, improved labels, modified accelerator