Another small merge fix