Execute yarn. Do not go git checkout --theirs ... and git reset ... and whatever else people might suggest. Just type yarn and press enter. Yarn has an automatic conflict resolution built into it, it will detect that the yarn.lock file has conflicts, and use its internal algorithm to figure out what to do. This was a public service announcement.
Slack has decided to remove the XMPP and IRC gateways, they will cease functioning on May 15th. It's a real shame, because these were the only usable interfaces to slack, both the web UI and the desktop app hog memory like a separate browser session, but there are still some solutions you can use to avoid using them.
As probably everyone heard by now, following the closure of FeedBurner in last year September, GoogleReader is closing down its doors on July 1st. Google is citing declining usage, which surprises me greatly since I remember news sites claiming in ~2008 that RSS's success is going to cause its own downfall, since so many people are using it that some servers can't handle the stress. If you aren't using RSS, you are missing out on one of the greatest functionalities of the web. Reading through an RSS reader is like watching your movies without commercials. I sampled the threads on Reddit, and Hacker News, to see what other good services are there.