Church of Scotland looks to address conflict in church and society