Acts 15: Conflicts are resolved