Resolve issues post-conflict