change edit to rename
fix spec descriptions
fix merge conflict