Another method duplicate. Looks like git failed to merge correctly.