-n 
new snapshot
updated routes
added dist
merged with conflict
new dist snapshot
ommited dist snapshot