added post-review changes
resolve merge conflicts