Update file headers.
Abuse the dot syntax

Personal preference. Not a big deal. What's the right emoji for "I don't think you'll merge this, but that's totally cool because it's silly"?
Resolve merge conflict