-n 
added dist
-n 
merged with conflict
-n 
new dist snapshot