* fix merge conflicts * fix linter --------- Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>