Let Yarn Resolve Your Conflicts
I had no idea that yarn could resolve merge conflicts in yarn.lock 
Tags: todayilearned, yarn, javascript