resolving conflicts in faith