Update dist
Fix stable conflicts
Merge conflicts
Add untracked files