-n 
added dist
-n 
merged with conflict
-n 
new dist snapshot
updated dist
merge with conflict
reset to dev
removed dist cache