remove merge conflict markers from yarn.lock