resolve merge conflict with @SoftwareTalks pull request