update templates etc
merge conflict
migration notes
style tweaks