[dickeytk]

resolving conflicts isn't why I read the diff (yarn resolves automatically anyways) it's so I can see what has changed