Add edit ability
Merging