resolve merge conflicts that were missed in PR