Fixing the overwritten merge.