Resolving conflicts (with NEWS) from PR #245)