typo in conflict merge

Was breaking "New Contribution" page.

Change-Id: Ifebbf373a3e053feec3b7306081d1c343b3ff035