remove conflicting comment