Stripped funky diffs from last conflicted push.