Update dist
Fix conflict