As discussed during the team meeting, the verb "merge" describes the
proposed functionality more accurately than "override". Therefore,
this patch changes the proposed flag from --override-labels to
--merge-labels.
Change-Id: I17654786a20778ed4772a4098f1edde89130a8a2