Resolve merge conflicts for stronger typing

Strengthen thine typing.