Various edit conflict handling fixes

bug: 33481
Change-Id: Ic068e82ecc9f94b423cf3966531a885249e1fefc
Merge "Various edit conflict handling fixes"