-n 
updated dist
-n 
merge with conflict
tmp added dist
Merge commit 'b6adf2700a2e44529bf3a5438a0267a3bc3f0dd9'
fixed dist issue
removed dist