Diocese merges efforts to form new Office of Faith Formation