German diocese must rework parish merger plan after Vatican objects