Respond to comments on PR
Resolve merge conflict