add dist directory, make lint pass
conflict