Attempting to resolve merge conflicts