What's <<<MSG? Something new I've never seen, or git merge weirdness?