fixup after merge conflict resolves