graphical repairs
custom merge