Fix merge conflict text in yarn.lock (#977)
Fix merge conflict text in yarn.lock (#977)


acburdine/Ghost-Admin,kevinansfield/Ghost-Admin,TryGhost/Ghost-Admin,kevinansfield/Ghost-Admin,TryGhost/Ghost-Admin,acburdine/Ghost-Admin