Resolve merge conflicts
Resolve merge conflicts