diet build
dist
resolve conflicts
conflict