Trying to fix a merge gone haywire