Resolve merge conflicts on 10/20