trail of moving spheres now corresponds to their size
conflict resolver commit