[BUGFIX] add missing parameter to handle_edit_conflict() method

Change-Id: I22d51d285f120131fc837b16fa361df2157cbcde