Resolve merge conflicts

Yup