handle merge and join propagation for edits, closes #602
alphabetize
Merge pull request #607 from modilabs/prop-edit-602

Prop edit 602