Clean up of failed-merge artifacts and more variable interpolation