Cleaning up merging conflicts - Making Voroni work