fixed what appears to be a merge error