popover modification
merge conflict resolution
popover amended
popover merge conflict resolved
popover merge conflict in controller resolved
popovers final amendment