Handle post edit conflicts

Change-Id: Ie8bf143a574b96709ccac22cad1cc9bb9e93a124