more lint via merge