fixed merge'd errors