Clean up lint.
Resolve merge conflicts