Popup on trying to do two edits inline at same time...
Merged origin with local