once again, a merge fix