Resolve merge conflicts one more zillion time.